Remove gesture shortcut restoration/merge logic from AMS
The gesture shortcut is restored in SettingsBackupAgent. In Setup
Wizard, there is no way for the user to turn on a gesture shortcut
because in Setup Wizard, it's in button navigation mode, hence no
gesture navigation available.
Bug: N/A
Test: N/A
Flag: EXEMPT comment only
Change-Id: I5fcd606ea645ae57b71420656ce0c30916471e65
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index 71a0fc4..b5e69e1 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -1071,8 +1071,11 @@
newValue, restoredFromSdk);
}
}
+ // Currently in SUW, the user can't see gesture shortcut option as the
+ // navigation system is set to button navigation. We'll rely on the
+ // SettingsBackupAgent to restore the settings since we don't
+ // need to merge an empty gesture target.
case Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS,
- Settings.Secure.ACCESSIBILITY_GESTURE_TARGETS,
Settings.Secure.ACCESSIBILITY_QS_TARGETS,
Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE ->
restoreShortcutTargets(newValue,