Merge "Revert Nav bar contrast under magnification" into pi-dev (04621f5b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/PhoneWindowManager.java

+1 −16

Original line number	Diff line number	Diff line
		@@ -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);
		}
		@@ -8570,14 +8563,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		return false;
		}

		@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);

+0 −7

Original line number	Diff line number	Diff line
		@@ -1739,13 +1739,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.
		*/

+0 −7

Original line number	Diff line number	Diff line
		@@ -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) {

+0 −4

Original line number	Diff line number	Diff line
		@@ -590,10 +590,6 @@ class TestWindowManagerPolicy implements WindowManagerPolicy {
		return true;
		}

		@Override
		public void onScreenMagnificationStateChanged(boolean active) {
		}

		@Override
		public void requestUserActivityNotification() {
		}