Merge "Window magnifier state is incorrect after screen is off" (dcc92705) · Commits · e / os / android_frameworks_base

services/accessibility/java/com/android/server/accessibility/magnification/WindowMagnificationGestureHandler.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -176,7 +176,7 @@ public class WindowMagnificationGestureHandler extends MagnificationGestureHandl
		Slog.i(LOG_TAG, "onDestroy(); delayed = "
		+ mDetectingState.toString());
		}
		mWindowMagnificationMgr.disableWindowMagnifier(mDisplayId, true);
		mWindowMagnificationMgr.disableWindowMagnification(mDisplayId, true);
		resetToDetectState();
		}

		@@ -211,14 +211,14 @@ public class WindowMagnificationGestureHandler extends MagnificationGestureHandl
		final float scale = MathUtils.constrain(
		mWindowMagnificationMgr.getPersistedScale(),
		MIN_SCALE, MAX_SCALE);
		mWindowMagnificationMgr.enableWindowMagnifier(mDisplayId, scale, centerX, centerY);
		mWindowMagnificationMgr.enableWindowMagnification(mDisplayId, scale, centerX, centerY);
		}

		private void disableWindowMagnifier() {
		if (DEBUG_ALL) {
		Slog.i(LOG_TAG, "disableWindowMagnifier()");
		}
		mWindowMagnificationMgr.disableWindowMagnifier(mDisplayId, false);
		mWindowMagnificationMgr.disableWindowMagnification(mDisplayId, false);
		}

		private void toggleMagnification(float centerX, float centerY) {

services/accessibility/java/com/android/server/accessibility/magnification/WindowMagnificationManager.java

+26 −24

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@ public class WindowMagnificationManager implements
		public void onReceive(Context context, Intent intent) {
		final int displayId = context.getDisplayId();
		removeMagnificationButton(displayId);
		disableWindowMagnification(displayId);
		disableWindowMagnification(displayId, false);
		}
		};

		@@ -136,10 +136,10 @@ public class WindowMagnificationManager implements
		/**
		* Requests {@link IWindowMagnificationConnection} through
		* {@link StatusBarManagerInternal#requestWindowMagnificationConnection(boolean)} and
		* destroys all window magnifiers if necessary.
		* destroys all window magnifications if necessary.
		*
		* @param connect {@code true} if needs connection, otherwise set the connection to null and
		* destroy all window magnifiers.
		* destroy all window magnifications.
		* @return {@code true} if {@link IWindowMagnificationConnection} state is going to change.
		*/
		public boolean requestConnection(boolean connect) {
		@@ -171,7 +171,7 @@ public class WindowMagnificationManager implements
		private void disableAllWindowMagnifiers() {
		for (int i = 0; i < mWindowMagnifiers.size(); i++) {
		final WindowMagnifier magnifier = mWindowMagnifiers.valueAt(i);
		magnifier.disable();
		magnifier.disableWindowMagnificationInternal();
		}
		mWindowMagnifiers.clear();
		}
		@@ -187,12 +187,12 @@ public class WindowMagnificationManager implements

		@Override
		public boolean processScroll(int displayId, float distanceX, float distanceY) {
		moveWindowMagnifier(displayId, -distanceX, -distanceY);
		moveWindowMagnification(displayId, -distanceX, -distanceY);
		return /* event consumed: */ true;
		}

		/**
		* Scales the magnified region on the specified display if the window magnifier is enabled.
		* Scales the magnified region on the specified display if the window magnifier is initiated.
		*
		* @param displayId The logical display id.
		* @param scale The target scale, must be >= 1
		@@ -209,7 +209,7 @@ public class WindowMagnificationManager implements
		}

		/**
		* Enables the window magnifier with specified center and scale on the specified display.
		* Enables window magnification with specified center and scale on the specified display.
		* @param displayId The logical display id.
		* @param scale The target scale, must be >= 1.
		* @param centerX The screen-relative X coordinate around which to center,
		@@ -217,29 +217,29 @@ public class WindowMagnificationManager implements
		* @param centerY The screen-relative Y coordinate around which to center,
		* or {@link Float#NaN} to leave unchanged.
		*/
		void enableWindowMagnifier(int displayId, float scale, float centerX, float centerY) {
		void enableWindowMagnification(int displayId, float scale, float centerX, float centerY) {
		synchronized (mLock) {
		WindowMagnifier magnifier = mWindowMagnifiers.get(displayId);
		if (magnifier == null) {
		magnifier = createWindowMagnifier(displayId);
		}
		magnifier.enable(scale, centerX, centerY);
		magnifier.enableWindowMagnificationInternal(scale, centerX, centerY);
		}
		}

		/**
		* Disables the window magnifier on the specified display.
		* Disables window magnification on the specified display.
		*
		* @param displayId The logical display id.
		* @param clear {@true} Clears the state of the window magnifier
		*/
		void disableWindowMagnifier(int displayId, boolean clear) {
		void disableWindowMagnification(int displayId, boolean clear) {
		synchronized (mLock) {
		WindowMagnifier magnifier = mWindowMagnifiers.get(displayId);
		if (magnifier == null) {
		return;
		}
		magnifier.disable();
		magnifier.disableWindowMagnificationInternal();
		if (clear) {
		mWindowMagnifiers.delete(displayId);
		}
		@@ -264,10 +264,10 @@ public class WindowMagnificationManager implements
		}

		/**
		* Indicates whether this window magnifier is enabled on specified display.
		* Indicates whether window magnification is enabled on specified display.
		*
		* @param displayId The logical display id.
		* @return {@code true} if the window magnifier is enabled.
		* @return {@code true} if the window magnification is enabled.
		*/
		boolean isWindowMagnifierEnabled(int displayId) {
		synchronized (mLock) {
		@@ -323,7 +323,7 @@ public class WindowMagnificationManager implements
		}

		/**
		* Moves the window magnifier with specified offset.
		* Moves window magnification on the specified display with the specified offset.
		*
		* @param displayId The logical display id.
		* @param offsetX the amount in pixels to offset the region in the X direction, in current
		@@ -331,7 +331,7 @@ public class WindowMagnificationManager implements
		* @param offsetY the amount in pixels to offset the region in the Y direction, in current
		* screen pixels.
		*/
		void moveWindowMagnifier(int displayId, float offsetX, float offsetY) {
		void moveWindowMagnification(int displayId, float offsetX, float offsetY) {
		synchronized (mLock) {
		WindowMagnifier magnifier = mWindowMagnifiers.get(displayId);
		if (magnifier == null) {
		@@ -425,7 +425,8 @@ public class WindowMagnificationManager implements
		}

		/**
		* A class to manipulate the window magnifier and contains the relevant information.
		* A class manipulates window magnification per display and contains the magnification
		* information.
		*/
		private static class WindowMagnifier {

		@@ -434,7 +435,7 @@ public class WindowMagnificationManager implements
		private boolean mEnabled;

		private final WindowMagnificationManager mWindowMagnificationManager;
		//Records the bounds of window magnifier.
		//Records the bounds of window magnification.
		private final Rect mBounds = new Rect();
		//The magnified bounds on the screen.
		private final Rect mSourceBounds = new Rect();
		@@ -444,12 +445,12 @@ public class WindowMagnificationManager implements
		}

		@GuardedBy("mLock")
		void enable(float scale, float centerX, float centerY) {
		void enableWindowMagnificationInternal(float scale, float centerX, float centerY) {
		if (mEnabled) {
		return;
		}
		final float normScale = MathUtils.constrain(scale, MIN_SCALE, MAX_SCALE);
		if (mWindowMagnificationManager.enableWindowMagnification(mDisplayId, normScale,
		if (mWindowMagnificationManager.enableWindowMagnificationInternal(mDisplayId, normScale,
		centerX, centerY)) {
		mScale = normScale;
		mEnabled = true;
		@@ -457,8 +458,9 @@ public class WindowMagnificationManager implements
		}

		@GuardedBy("mLock")
		void disable() {
		if (mEnabled && mWindowMagnificationManager.disableWindowMagnification(mDisplayId)) {
		void disableWindowMagnificationInternal() {
		if (mEnabled && mWindowMagnificationManager.disableWindowMagnificationInternal(
		mDisplayId)) {
		mEnabled = false;
		}
		}
		@@ -519,7 +521,7 @@ public class WindowMagnificationManager implements
		}
		}

		private boolean enableWindowMagnification(int displayId, float scale, float centerX,
		private boolean enableWindowMagnificationInternal(int displayId, float scale, float centerX,
		float centerY) {
		return mConnectionWrapper != null && mConnectionWrapper.enableWindowMagnification(
		displayId, scale, centerX, centerY);
		@@ -529,7 +531,7 @@ public class WindowMagnificationManager implements
		return mConnectionWrapper != null && mConnectionWrapper.setScale(displayId, scale);
		}

		private boolean disableWindowMagnification(int displayId) {
		private boolean disableWindowMagnificationInternal(int displayId) {
		return mConnectionWrapper != null && mConnectionWrapper.disableWindowMagnification(
		displayId);
		}

services/tests/servicestests/src/com/android/server/accessibility/magnification/WindowMagnificationGestureHandlerTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ public class WindowMagnificationGestureHandlerTest {

		@After
		public void tearDown() {
		mWindowMagnificationManager.disableWindowMagnifier(DISPLAY_0, true);
		mWindowMagnificationManager.disableWindowMagnification(DISPLAY_0, true);
		}

		@Test
		@@ -225,7 +225,7 @@ public class WindowMagnificationGestureHandlerTest {
		}
		break;
		case STATE_SHOW_MAGNIFIER: {
		mWindowMagnificationManager.disableWindowMagnifier(DISPLAY_0, false);
		mWindowMagnificationManager.disableWindowMagnification(DISPLAY_0, false);
		}
		break;
		case STATE_TWO_FINGERS_DOWN: {

services/tests/servicestests/src/com/android/server/accessibility/magnification/WindowMagnificationManagerTest.java

+22 −17

Original line number	Diff line number	Diff line
		@@ -68,8 +68,10 @@ public class WindowMagnificationManagerTest {
		private static final int CURRENT_USER_ID = UserHandle.USER_CURRENT;

		private MockWindowMagnificationConnection mMockConnection;
		@Mock private Context mContext;
		@Mock private StatusBarManagerInternal mMockStatusBarManagerInternal;
		@Mock
		private Context mContext;
		@Mock
		private StatusBarManagerInternal mMockStatusBarManagerInternal;
		private MockContentResolver mResolver;
		private WindowMagnificationManager mWindowMagnificationManager;

		@@ -161,7 +163,7 @@ public class WindowMagnificationManagerTest {
		public void enable_TestDisplay_enableWindowMagnification() throws RemoteException {
		mWindowMagnificationManager.setConnection(mMockConnection.getConnection());

		mWindowMagnificationManager.enableWindowMagnifier(TEST_DISPLAY, 2f, 200f, 300f);
		mWindowMagnificationManager.enableWindowMagnification(TEST_DISPLAY, 2f, 200f, 300f);

		verify(mMockConnection.getConnection()).enableWindowMagnification(TEST_DISPLAY, 2f,
		200f, 300f);
		@@ -170,9 +172,9 @@ public class WindowMagnificationManagerTest {
		@Test
		public void disable_testDisplay_disableWindowMagnification() throws RemoteException {
		mWindowMagnificationManager.setConnection(mMockConnection.getConnection());
		mWindowMagnificationManager.enableWindowMagnifier(TEST_DISPLAY, 3f, NaN, NaN);
		mWindowMagnificationManager.enableWindowMagnification(TEST_DISPLAY, 3f, NaN, NaN);

		mWindowMagnificationManager.disableWindowMagnifier(TEST_DISPLAY, false);
		mWindowMagnificationManager.disableWindowMagnification(TEST_DISPLAY, false);

		verify(mMockConnection.getConnection()).disableWindowMagnification(TEST_DISPLAY);
		}
		@@ -183,7 +185,7 @@ public class WindowMagnificationManagerTest {

		assertFalse(mWindowMagnificationManager.isWindowMagnifierEnabled(TEST_DISPLAY));

		mWindowMagnificationManager.enableWindowMagnifier(TEST_DISPLAY, 2f, NaN, NaN);
		mWindowMagnificationManager.enableWindowMagnification(TEST_DISPLAY, 2f, NaN, NaN);

		assertTrue(mWindowMagnificationManager.isWindowMagnifierEnabled(TEST_DISPLAY));
		}
		@@ -198,7 +200,7 @@ public class WindowMagnificationManagerTest {
		@Test
		public void persistScale_setValue_expectedValueInProvider() {
		mWindowMagnificationManager.setConnection(mMockConnection.getConnection());
		mWindowMagnificationManager.enableWindowMagnifier(TEST_DISPLAY, 2.0f, NaN, NaN);
		mWindowMagnificationManager.enableWindowMagnification(TEST_DISPLAY, 2.0f, NaN, NaN);
		mWindowMagnificationManager.setScale(TEST_DISPLAY, 2.5f);

		mWindowMagnificationManager.persistScale(TEST_DISPLAY);
		@@ -211,7 +213,7 @@ public class WindowMagnificationManagerTest {
		@Test
		public void scaleSetterGetter_enabledOnTestDisplay_expectedValue() {
		mWindowMagnificationManager.setConnection(mMockConnection.getConnection());
		mWindowMagnificationManager.enableWindowMagnifier(TEST_DISPLAY, 2.0f, NaN, NaN);
		mWindowMagnificationManager.enableWindowMagnification(TEST_DISPLAY, 2.0f, NaN, NaN);

		mWindowMagnificationManager.setScale(TEST_DISPLAY, 2.5f);

		@@ -221,7 +223,7 @@ public class WindowMagnificationManagerTest {
		@Test
		public void scaleSetterGetter_scaleIsOutOfRang_getNormalizeValue() {
		mWindowMagnificationManager.setConnection(mMockConnection.getConnection());
		mWindowMagnificationManager.enableWindowMagnifier(TEST_DISPLAY, 2.5f, NaN, NaN);
		mWindowMagnificationManager.enableWindowMagnification(TEST_DISPLAY, 2.5f, NaN, NaN);

		mWindowMagnificationManager.setScale(TEST_DISPLAY, 10.0f);

		@@ -232,9 +234,9 @@ public class WindowMagnificationManagerTest {
		@Test
		public void moveWindowMagnifier() throws RemoteException {
		mWindowMagnificationManager.setConnection(mMockConnection.getConnection());
		mWindowMagnificationManager.enableWindowMagnifier(TEST_DISPLAY, 2f, NaN, NaN);
		mWindowMagnificationManager.enableWindowMagnification(TEST_DISPLAY, 2f, NaN, NaN);

		mWindowMagnificationManager.moveWindowMagnifier(TEST_DISPLAY, 200, 300);
		mWindowMagnificationManager.moveWindowMagnification(TEST_DISPLAY, 200, 300);
		verify(mMockConnection.getConnection()).moveWindowMagnifier(TEST_DISPLAY, 200, 300);
		}

		@@ -254,7 +256,7 @@ public class WindowMagnificationManagerTest {
		@Test
		public void pointersInWindow_returnCorrectValue() throws RemoteException {
		mWindowMagnificationManager.setConnection(mMockConnection.getConnection());
		mWindowMagnificationManager.enableWindowMagnifier(TEST_DISPLAY, 3.0f, NaN, NaN);
		mWindowMagnificationManager.enableWindowMagnification(TEST_DISPLAY, 3.0f, NaN, NaN);
		mMockConnection.getConnectionCallback().onWindowMagnifierBoundsChanged(TEST_DISPLAY,
		new Rect(0, 0, 500, 500));
		PointF[] pointersLocation = new PointF[2];
		@@ -268,7 +270,7 @@ public class WindowMagnificationManagerTest {
		@Test
		public void binderDied_windowMagnifierIsEnabled_resetState() throws RemoteException {
		mWindowMagnificationManager.setConnection(mMockConnection.getConnection());
		mWindowMagnificationManager.enableWindowMagnifier(TEST_DISPLAY, 3f, NaN, NaN);
		mWindowMagnificationManager.enableWindowMagnification(TEST_DISPLAY, 3f, NaN, NaN);

		mMockConnection.getDeathRecipient().binderDied();

		@@ -280,7 +282,7 @@ public class WindowMagnificationManagerTest {
		requestConnectionToNull_disableAllMagnifiersAndRequestWindowMagnificationConnection()
		throws RemoteException {
		mWindowMagnificationManager.setConnection(mMockConnection.getConnection());
		mWindowMagnificationManager.enableWindowMagnifier(TEST_DISPLAY, 3f, NaN, NaN);
		mWindowMagnificationManager.enableWindowMagnification(TEST_DISPLAY, 3f, NaN, NaN);

		assertTrue(mWindowMagnificationManager.requestConnection(false));

		@@ -313,14 +315,17 @@ public class WindowMagnificationManagerTest {
		}

		@Test
		public void onReceiveScreenOff_removeMagnificationButtonAndDisableWindowMagnification()
		public void onScreenOff_windowMagnifierIsEnabled_removeButtonAndDisableWindowMagnification()
		throws RemoteException {
		mWindowMagnificationManager.requestConnection(true);
		mWindowMagnificationManager.enableWindowMagnification(TEST_DISPLAY, 2.5f, NaN, NaN);

		mWindowMagnificationManager.mScreenStateReceiver.onReceive(mContext,
		new Intent(Intent.ACTION_SCREEN_OFF));

		verify(mMockConnection.getConnection()).removeMagnificationButton(TEST_DISPLAY);
		verify(mMockConnection.getConnection()).disableWindowMagnification(TEST_DISPLAY);
		assertFalse(mWindowMagnificationManager.isWindowMagnifierEnabled(TEST_DISPLAY));
		}

		private MotionEvent generatePointersDownEvent(PointF[] pointersLocation) {