| commit | 71c030a864c01cdf3d4d9736849a73b772369e7d | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Jun 22 21:12:25 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 22 21:12:25 2020 +0000 |
| tree | 5245691d09aa3c07dde64df1bf5006f66a105dcb | |
| parent | 8187209e5bad19e558e9042d40c343fad25c99a0 [diff] | |
| parent | ceaad08f0635d463758eac42c7450b44bf7821b9 [diff] |
Merge "Fixing rotation watcher not enabled in landscape" into ub-launcher3-rvc-dev am: ceaad08f06 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11959138 Change-Id: Ida6defb23bd6d816332441266ecfc78e715f740f
diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java index b9953cb..b359f0f 100644 --- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java +++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -348,8 +348,10 @@ } public boolean isRecentsActivityRotationAllowed() { + // Activity rotation is allowed if the multi-simulated-rotation is not supported + // (fallback recents or tablets) or activity rotation is enabled by various settings. return ((mFlags & MASK_MULTIPLE_ORIENTATION_SUPPORTED_BY_DEVICE) - == MASK_MULTIPLE_ORIENTATION_SUPPORTED_BY_DEVICE) + != MASK_MULTIPLE_ORIENTATION_SUPPORTED_BY_DEVICE) || (mFlags & (FLAG_HOME_ROTATION_ALLOWED_IN_PREFS | FLAG_MULTIWINDOW_ROTATION_ALLOWED | FLAG_HOME_ROTATION_FORCE_ENABLED_FOR_TESTING)) != 0;