Merge "Do not skip restoring rotation lock when returning to home" into sc-v2-dev am: 49794ebb48 am: 669edf2083

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16334320 Change-Id: I8390ba655923f8a495d98b496e1b304e3bbbefe9
2021-11-25 02:52:13 +00:00
parent 2f1acdde61 669edf2083
commit 67714172db
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java
@@ -481,7 +481,9 @@ public class RotationButtonController {
     * orientation overview.
     */
    public void setSkipOverrideUserLockPrefsOnce() {
-        mSkipOverrideUserLockPrefsOnce = true;
+        // If live-tile is enabled (recents animation keeps running in overview), there is no
+        // activity switch so the display rotation is not changed, then it is no need to skip.
+        mSkipOverrideUserLockPrefsOnce = !mIsRecentsAnimationRunning;
    }

    private boolean shouldOverrideUserLockPrefs(final int rotation) {