diff options
3 files changed, 25 insertions, 3 deletions
diff --git a/core/java/com/android/internal/accessibility/common/MagnificationConstants.java b/core/java/com/android/internal/accessibility/common/MagnificationConstants.java index 2db3e658530f..67e587e17e31 100644 --- a/core/java/com/android/internal/accessibility/common/MagnificationConstants.java +++ b/core/java/com/android/internal/accessibility/common/MagnificationConstants.java @@ -33,7 +33,7 @@ public final class MagnificationConstants { /** Minimum supported value for magnification scale. */ public static final float SCALE_MIN_VALUE = 1.0f; - /** Maximum supported value for magnification scale. Default of 8.0. */ + /** Maximum supported value for magnification scale. Default of 20.0. */ public static final float SCALE_MAX_VALUE = - Float.parseFloat(SystemProperties.get("ro.config.max_magnification_scale", "8.0")); + Float.parseFloat(SystemProperties.get("ro.config.max_magnification_scale", "20.0")); } diff --git a/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandlerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandlerTest.java index 957ee06b6e27..1a3af138894d 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandlerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandlerTest.java @@ -1320,6 +1320,16 @@ public class FullScreenMagnificationGestureHandlerTest { } @Test + public void testSetScaleTo2() { + testSetScaleAndZoom(2.0f); + } + + @Test + public void testSetScaleTo20() { + testSetScaleAndZoom(20.0f); + } + + @Test public void testTransitToPanningState_scaleDifferenceOverThreshold_startDetecting() { final float scale = 2.0f; final float threshold = FullScreenMagnificationGestureHandler.PanningScalingState @@ -1698,6 +1708,18 @@ public class FullScreenMagnificationGestureHandlerTest { assertActionsInOrder(eventCaptor.mEvents, expectedActions); } + private void testSetScaleAndZoom(float scale) { + Settings.Secure.putFloatForUser(mContext.getContentResolver(), + Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE, scale, + UserHandle.USER_SYSTEM); + + goFromStateIdleTo(STATE_ACTIVATED_2TAPS); + + check(mMgh.mCurrentState == mMgh.mDetectingState, STATE_IDLE); + assertThat(mMgh.mFullScreenMagnificationController.getScale(DISPLAY_0)) + .isEqualTo(scale); + } + private void enableOneFingerPanning(boolean enable) { mMockOneFingerPanningEnabled = enable; when(mMockOneFingerPanningSettingsProvider.isOneFingerPanningEnabled()).thenReturn(enable); diff --git a/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationConnectionManagerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationConnectionManagerTest.java index 87fe6cf8f283..1c0ddc242ca6 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationConnectionManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationConnectionManagerTest.java @@ -300,7 +300,7 @@ public class MagnificationConnectionManagerTest { mMagnificationConnectionManager.setConnection(mMockConnection.getConnection()); mMagnificationConnectionManager.enableWindowMagnification(TEST_DISPLAY, 2.5f, NaN, NaN); - mMagnificationConnectionManager.setScale(TEST_DISPLAY, 10.0f); + mMagnificationConnectionManager.setScale(TEST_DISPLAY, 22.0f); assertEquals(mMagnificationConnectionManager.getScale(TEST_DISPLAY), MagnificationScaleProvider.MAX_SCALE); |