diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java index a67ec65cceda..8734d05bc894 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java @@ -296,6 +296,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold mGestureDetector = new MagnificationGestureDetector(mContext, handler, this); mWindowInsetChangeRunnable = this::onWindowInsetChanged; + mWindowInsetChangeRunnable.run(); // Initialize listeners. mMirrorViewRunnable = new Runnable() { @@ -367,8 +368,12 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold private boolean updateSystemGestureInsetsTop() { final WindowMetrics windowMetrics = mWm.getCurrentWindowMetrics(); final Insets insets = windowMetrics.getWindowInsets().getInsets(systemGestures()); - final int gestureTop = - insets.bottom != 0 ? windowMetrics.getBounds().bottom - insets.bottom : -1; + final int gestureTop; + if (Flags.updateWindowMagnifierBottomBoundary()) { + gestureTop = windowMetrics.getBounds().bottom - insets.bottom; + } else { + gestureTop = insets.bottom != 0 ? windowMetrics.getBounds().bottom - insets.bottom : -1; + } if (gestureTop != mSystemGestureTop) { mSystemGestureTop = gestureTop; return true; @@ -953,7 +958,6 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold ? mSystemGestureTop - height + mOuterBorderSize : mWindowBounds.bottom - height + mOuterBorderSize; final int y = MathUtils.clamp(mMagnificationFrame.top - mMirrorSurfaceMargin, minY, maxY); - if (computeWindowSize) { LayoutParams params = (LayoutParams) mMirrorView.getLayoutParams(); params.width = width; |