Merge "Fix shortcut rotate trigger swipe notification" into sc-dev

2021-06-18 17:12:22 +00:00
parent 940921d09e 638db506c8
commit bd1d84122b
1 changed files with 7 additions and 0 deletions
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedDisplayAreaOrganizer.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedDisplayAreaOrganizer.java
@@ -191,8 +191,15 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer {
                myUserId())) {
            return;
        }
+
        mDisplayLayout.rotateTo(context.getResources(), toRotation);
        updateDisplayBounds();
+
+        if (mOneHandedSettingsUtil.getSettingsSwipeToNotificationEnabled(
+                context.getContentResolver(), myUserId())) {
+            // If current settings is swipe notification, skip finishOffset.
+            return;
+        }
        finishOffset(0, TRANSITION_DIRECTION_EXIT);
    }