From dcee5c41ee3fe2bf778716d9629ad93c56d7ec76 Mon Sep 17 00:00:00 2001
From: ktanojo <ktanojo@google.com>
Date: Fri, 12 May 2023 21:19:10 +0000
Subject: [PATCH] Add config to enable/disable single panning depending on
 device

updateController will load the default value from the respective
config/xml file and set the value to the default value. This feature
will be disabled by default, but can be enabled by devices via config
overlay

Bug: 282065026, 279498927
Test: manual test
Change-Id: I23ee76d41f8de7b75e8ff224f027a45c1257d67e
---
 core/res/res/values/config.xml                                | 4 ++++
 core/res/res/values/symbols.xml                               | 3 +++
 .../magnification/FullScreenMagnificationGestureHandler.java  | 4 +++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index f63f8b3c7af8d..d5aaeefe1cfca 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -6559,6 +6559,10 @@
          serialization, a default vibration will be used.
          Note that, indefinitely repeating vibrations are not allowed as shutdown vibrations. -->
     <string name="config_defaultShutdownVibrationFile" />
+
+    <!-- Whether single finger panning is enabled when magnification is on -->
+    <bool name="config_enable_a11y_magnification_single_panning">false</bool>
+
     <!-- The file path in which custom vibrations are provided for haptic feedbacks.
          If the device does not specify any such file path here, if the file path specified here
          does not exist, or if the contents of the file does not make up a valid customization
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 8e52633c83245..bd678cc062238 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -5179,5 +5179,8 @@
   <java-symbol type="drawable" name="focus_event_pressed_key_background" />
   <java-symbol type="string" name="config_defaultShutdownVibrationFile" />
   <java-symbol type="string" name="lockscreen_too_many_failed_attempts_countdown" />
+
+  <java-symbol type="bool" name="config_enable_a11y_magnification_single_panning" />
+
   <java-symbol type="string" name="config_hapticFeedbackCustomizationFile" />
 </resources>
diff --git a/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandler.java b/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandler.java
index 03ba29519d732..fd8babbbd5b16 100644
--- a/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandler.java
+++ b/services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandler.java
@@ -204,7 +204,9 @@ public class FullScreenMagnificationGestureHandler extends MagnificationGestureH
         mViewportDraggingState = new ViewportDraggingState();
         mPanningScalingState = new PanningScalingState(context);
         mSinglePanningState = new SinglePanningState(context);
-        setSinglePanningEnabled(false);
+        setSinglePanningEnabled(
+                context.getResources()
+                        .getBoolean(R.bool.config_enable_a11y_magnification_single_panning));
 
         if (mDetectShortcutTrigger) {
             mScreenStateReceiver = new ScreenStateReceiver(context, this);