diff options
3 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java index f2ad2683f4e0..35098a0ff5d9 100644 --- a/core/java/android/accessibilityservice/AccessibilityService.java +++ b/core/java/android/accessibilityservice/AccessibilityService.java @@ -1090,7 +1090,7 @@ public abstract class AccessibilityService extends Service { * called) or the service has been disconnected, this method will have * no effect and return {@code false}. * - * @param scale the magnification scale to set, must be >= 1 and <= 5 + * @param scale the magnification scale to set, must be >= 1 and <= 8 * @param animate {@code true} to animate from the current scale or * {@code false} to set the scale immediately * @return {@code true} on success, {@code false} on failure diff --git a/services/accessibility/java/com/android/server/accessibility/MagnificationController.java b/services/accessibility/java/com/android/server/accessibility/MagnificationController.java index 17bf5705d489..6a97fbbf30da 100644 --- a/services/accessibility/java/com/android/server/accessibility/MagnificationController.java +++ b/services/accessibility/java/com/android/server/accessibility/MagnificationController.java @@ -32,7 +32,6 @@ import android.provider.Settings; import android.text.TextUtils; import android.util.MathUtils; import android.util.Slog; -import android.util.SparseArray; import android.view.Display; import android.view.MagnificationSpec; import android.view.View; @@ -40,8 +39,6 @@ import android.view.animation.DecelerateInterpolator; import com.android.internal.R; import com.android.internal.annotations.GuardedBy; -import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.os.SomeArgs; import com.android.internal.util.function.pooled.PooledLambda; import com.android.server.LocalServices; import com.android.server.wm.WindowManagerInternal; @@ -63,7 +60,7 @@ public class MagnificationController { private static final String LOG_TAG = "MagnificationController"; public static final float MIN_SCALE = 1.0f; - public static final float MAX_SCALE = 5.0f; + public static final float MAX_SCALE = 8.0f; private static final boolean DEBUG_SET_MAGNIFICATION_SPEC = false; diff --git a/services/accessibility/java/com/android/server/accessibility/MagnificationGestureHandler.java b/services/accessibility/java/com/android/server/accessibility/MagnificationGestureHandler.java index 12e7376b750f..80049e80e1a9 100644 --- a/services/accessibility/java/com/android/server/accessibility/MagnificationGestureHandler.java +++ b/services/accessibility/java/com/android/server/accessibility/MagnificationGestureHandler.java @@ -115,8 +115,11 @@ class MagnificationGestureHandler extends BaseEventStreamTransformation { private static final boolean DEBUG_PANNING_SCALING = false || DEBUG_ALL; private static final boolean DEBUG_EVENT_STREAM = false || DEBUG_ALL; + // The MIN_SCALE is different from MagnificationController.MIN_SCALE due + // to AccessibilityService.MagnificationController#setScale() has + // different scale range private static final float MIN_SCALE = 2.0f; - private static final float MAX_SCALE = 5.0f; + private static final float MAX_SCALE = MagnificationController.MAX_SCALE; @VisibleForTesting final MagnificationController mMagnificationController; |