Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fa8705e authored by Chun-Ku Lin's avatar Chun-Ku Lin
Browse files

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
parent 64ae6a5d

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+4 −1
Original line number Diff line number Diff line
@@ -1071,8 +1071,11 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                                        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,