diff options
| author | 2021-03-31 06:53:40 +0000 | |
|---|---|---|
| committer | 2021-03-31 06:53:40 +0000 | |
| commit | eb4158fbb0352fb88bc738d573d8a69475d600fc (patch) | |
| tree | 78cd3970779e82f914a70f3c6a228175762719bb | |
| parent | bd374dc3994ab8fa41b08f9fc1931ec019f28207 (diff) | |
| parent | 894696d61ecf2f05ebff96c9bbbd420c0c1fa41f (diff) | |
Merge "Dispatch newDisplayLayout in updateDisplayLayout() directly" into sc-dev
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java | 6 | ||||
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedGestureHandler.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java index 7965a80deead..8bbc35fa7c61 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java @@ -403,9 +403,9 @@ public class OneHandedController implements RemoteCallable<OneHandedController> } private void updateDisplayLayout(int displayId) { - mDisplayAreaOrganizer.setDisplayLayout( - mDisplayController.getDisplayLayout(displayId)); - mGestureHandler.onDisplayChanged(mDisplayAreaOrganizer.getDisplayLayout()); + final DisplayLayout newDisplayLayout = mDisplayController.getDisplayLayout(displayId); + mDisplayAreaOrganizer.setDisplayLayout(newDisplayLayout); + mGestureHandler.onDisplayChanged(newDisplayLayout); } private ContentObserver getObserver(Runnable onChangeRunnable) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedGestureHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedGestureHandler.java index 495362a3eef7..9e83a61667b2 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedGestureHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedGestureHandler.java @@ -63,7 +63,7 @@ public class OneHandedGestureHandler implements OneHandedTransitionCallback { private boolean mIsEnabled; private int mNavGestureHeight; private boolean mIsThreeButtonModeEnabled; - private int mRotation; + private int mRotation = Surface.ROTATION_0; @VisibleForTesting InputMonitor mInputMonitor; |