diff options
4 files changed, 1 insertions, 34 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index e6d851b83aa8..16440c818959 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -803,9 +803,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { private int mCurrentUserId; - /* Whether accessibility is magnifying the screen */ - private boolean mScreenMagnificationActive; - // Maps global key codes to the components that will handle them. private GlobalKeyManager mGlobalKeyManager; @@ -8412,11 +8409,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { */ private int configureNavBarOpacity(int visibility, boolean dockedStackVisible, boolean freeformStackVisible, boolean isDockedDividerResizing) { - if (mScreenMagnificationActive) { - // When the screen is magnified, the nav bar should be opaque since its background - // can vary as the user pans and zooms - visibility = setNavBarOpaqueFlag(visibility); - } else if (mNavBarOpacityMode == NAV_BAR_OPAQUE_WHEN_FREEFORM_OR_DOCKED) { + if (mNavBarOpacityMode == NAV_BAR_OPAQUE_WHEN_FREEFORM_OR_DOCKED) { if (dockedStackVisible || freeformStackVisible || isDockedDividerResizing) { visibility = setNavBarOpaqueFlag(visibility); } @@ -8571,14 +8564,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { } @Override - public void onScreenMagnificationStateChanged(boolean active) { - synchronized (mWindowManagerFuncs.getWindowManagerLock()) { - mScreenMagnificationActive = active; - updateSystemUiVisibilityLw(); - } - } - - @Override public void writeToProto(ProtoOutputStream proto, long fieldId) { final long token = proto.start(fieldId); proto.write(LAST_SYSTEM_UI_FLAGS, mLastSystemUiFlags); diff --git a/services/core/java/com/android/server/policy/WindowManagerPolicy.java b/services/core/java/com/android/server/policy/WindowManagerPolicy.java index 8690a8392961..33eafb9e3e33 100644 --- a/services/core/java/com/android/server/policy/WindowManagerPolicy.java +++ b/services/core/java/com/android/server/policy/WindowManagerPolicy.java @@ -1740,13 +1740,6 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { boolean canDismissBootAnimation(); /** - * Called when the magnification state changes. - * - * @param active Whether magnification is active (that is, we are zoomed in). - */ - void onScreenMagnificationStateChanged(boolean active); - - /** * Convert the user rotation mode to a human readable format. */ static String userRotationModeToString(int mode) { diff --git a/services/core/java/com/android/server/wm/AccessibilityController.java b/services/core/java/com/android/server/wm/AccessibilityController.java index 68be50c2689a..f5f994ae05fd 100644 --- a/services/core/java/com/android/server/wm/AccessibilityController.java +++ b/services/core/java/com/android/server/wm/AccessibilityController.java @@ -87,8 +87,6 @@ final class AccessibilityController { private WindowsForAccessibilityObserver mWindowsForAccessibilityObserver; - private boolean mScreenMagnificationActive; - public void setMagnificationCallbacksLocked(MagnificationCallbacks callbacks) { if (callbacks != null) { if (mDisplayMagnifier != null) { @@ -138,11 +136,6 @@ final class AccessibilityController { if (mWindowsForAccessibilityObserver != null) { mWindowsForAccessibilityObserver.scheduleComputeChangedWindowsLocked(); } - boolean nowActive = !spec.isNop(); - if (nowActive != mScreenMagnificationActive) { - mScreenMagnificationActive = nowActive; - mService.mPolicy.onScreenMagnificationStateChanged(nowActive); - } } public void getMagnificationRegionLocked(Region outMagnificationRegion) { diff --git a/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java b/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java index 013c67255248..765b3d5957c4 100644 --- a/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java +++ b/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java @@ -591,10 +591,6 @@ class TestWindowManagerPolicy implements WindowManagerPolicy { } @Override - public void onScreenMagnificationStateChanged(boolean active) { - } - - @Override public void requestUserActivityNotification() { } |