commit e138389214cda4d6cfa7af0620f20ca1b5373ca8
author Alex Chau <alexchau@google.com> Tue Jan 12 16:22:18 2021 +0000
committer Alex Chau <alexchau@google.com> Thu Jan 14 12:53:29 2021 +0000
tree 9c2021f7c711da85324f30c85ee7b88bd1b39fad
parent 23f0dc318c93ef34c80a18c35636c91c1fb16e3b

Flag FLAG_MULTIPLE_ORIENTATION_SUPPORTED_BY_DENSITY false when allow_rotation is set

Bug: 177312556
Change-Id: I22e28b60be68b9cf7bb064d801854d0093920c9e

quickstep/src/com/android/quickstep/util/RecentsOrientedState.java

diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index dd3e31f..a89aaf4 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -49,6 +49,7 @@
 
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.InvariantDeviceProfile;
+import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.testing.TestProtocol;
 import com.android.launcher3.touch.PagedOrientationHandler;
@@ -156,7 +157,8 @@
         Resources res = context.getResources();
         int originalSmallestWidth = res.getConfiguration().smallestScreenWidthDp
                 * res.getDisplayMetrics().densityDpi / DENSITY_DEVICE_STABLE;
-        if (originalSmallestWidth < 600) {
+        if (originalSmallestWidth < 600 && !mContext.getResources().getBoolean(
+                R.bool.allow_rotation)) {
             mFlags |= FLAG_MULTIPLE_ORIENTATION_SUPPORTED_BY_DENSITY;
         }
         mFlags |= FLAG_SWIPE_UP_NOT_RUNNING;