Merge "Magnification: Add isAnyMagnificationActivated method" into main (ef669624) · Commits · e / os / android_frameworks_base

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -462,6 +462,15 @@ public class MagnificationController implements MagnificationConnectionManager.C

		@Override
		public boolean isMagnificationActivated(int displayId) {
		return isAnyMagnificationActivated(displayId);
		}

		/**
		* Return {@code true} if either full-screen magnification or window magnification is activated.
		*
		* @param displayId The logical display id
		*/
		public boolean isAnyMagnificationActivated(int displayId) {
		return mFullScreenMagnificationController.isActivated(displayId)
		\|\| getMagnificationConnectionManager().isWindowMagnifierEnabled(displayId);
		}

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

+40 −0

Original line number	Diff line number	Diff line
		@@ -663,6 +663,46 @@ public class MagnificationControllerTest {
		verify(mScaleProvider).onUserChanged(SECOND_USER_ID);
		}

		@Test
		public void isAnyMagnificationActivated_noMagnificationActivatedByDefault_returnFalse() {
		// By default both fullscreen and window magnification are deactivated
		assertThat(mMagnificationController.isAnyMagnificationActivated(TEST_DISPLAY)).isFalse();
		}

		@Test
		public void isAnyMagnificationActivated_activatingFullScreenMagnification_returnTrue()
		throws RemoteException {
		setMagnificationEnabled(MODE_FULLSCREEN);
		assertThat(mMagnificationController.isAnyMagnificationActivated(TEST_DISPLAY)).isTrue();
		}

		@Test
		public void isAnyMagnificationActivated_deactivatingFullScreenMagnification_returnFalse()
		throws RemoteException {
		setMagnificationEnabled(MODE_FULLSCREEN);

		mScreenMagnificationController.reset(TEST_DISPLAY, /* animate= */ false);

		assertThat(mMagnificationController.isAnyMagnificationActivated(TEST_DISPLAY)).isFalse();
		}

		@Test
		public void isAnyMagnificationActivated_activatingWindowMagnification_returnTrue()
		throws RemoteException {
		setMagnificationEnabled(MODE_WINDOW);
		assertThat(mMagnificationController.isAnyMagnificationActivated(TEST_DISPLAY)).isTrue();
		}

		@Test
		public void isAnyMagnificationActivated_deactivatingWindowMagnification_returnFalse()
		throws RemoteException {
		setMagnificationEnabled(MODE_WINDOW);

		mMagnificationConnectionManager.disableWindowMagnification(TEST_DISPLAY, false);

		assertThat(mMagnificationController.isAnyMagnificationActivated(TEST_DISPLAY)).isFalse();
		}

		@Test
		public void onMagnificationRequest_windowMagnifying_disableWindow() throws RemoteException {
		setMagnificationEnabled(MODE_WINDOW);