From e1eec164275a84c962b1930ba0d1d6a2b3a15f9d Mon Sep 17 00:00:00 2001 From: jasonwshsu Date: Tue, 7 Apr 2020 16:56:02 +0800 Subject: [PATCH] Use new setting key to maintain the list of user assigned shortcut targets. * Framework changes to keep ACCESSIBILITY_BUTTON_TARGET_COMPONENT contains only a single target, use ACCESSIBILITY_BUTTON_TARGETS to maintain the targets list. Bug: 151295675 Test: manual test Change-Id: I2218402fd122acc9a86c64127e9cfcf77a6e241e --- .../android/settings/accessibility/AccessibilitySettings.java | 2 +- src/com/android/settings/accessibility/AccessibilityUtil.java | 2 +- .../settings/accessibility/MagnificationPreferenceFragment.java | 2 +- .../android/settings/accessibility/AccessibilityUtilTest.java | 2 +- .../ToggleScreenMagnificationPreferenceFragmentTest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index 3b3c2c544c4..02302433aa3 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -193,7 +193,7 @@ public class AccessibilitySettings extends DashboardFragment { } // Observe changes from accessibility selection menu - shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_BUTTON_TARGET_COMPONENT); + shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS); shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE); mSettingsContentObserver = new SettingsContentObserver(mHandler, shortcutFeatureKeys) { @Override diff --git a/src/com/android/settings/accessibility/AccessibilityUtil.java b/src/com/android/settings/accessibility/AccessibilityUtil.java index ce0b5fb4b34..a0e3d81403e 100644 --- a/src/com/android/settings/accessibility/AccessibilityUtil.java +++ b/src/com/android/settings/accessibility/AccessibilityUtil.java @@ -342,7 +342,7 @@ final class AccessibilityUtil { static String convertKeyFromSettings(@UserShortcutType int shortcutType) { switch (shortcutType) { case UserShortcutType.SOFTWARE: - return Settings.Secure.ACCESSIBILITY_BUTTON_TARGET_COMPONENT; + return Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS; case UserShortcutType.HARDWARE: return Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE; case UserShortcutType.TRIPLETAP: diff --git a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java index 0e6d3becc57..d589f0f03d4 100644 --- a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java @@ -120,7 +120,7 @@ public final class MagnificationPreferenceFragment extends DashboardFragment { final AccessibilityManager am = (AccessibilityManager) context.getSystemService( Context.ACCESSIBILITY_SERVICE); final String assignedId = Settings.Secure.getString(context.getContentResolver(), - Settings.Secure.ACCESSIBILITY_BUTTON_TARGET_COMPONENT); + Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS); if (!TextUtils.isEmpty(assignedId) && !MAGNIFICATION_COMPONENT_ID.equals(assignedId)) { final ComponentName assignedComponentName = ComponentName.unflattenFromString( assignedId); diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java index 655e7b60b8c..b8936c4601e 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java @@ -52,7 +52,7 @@ public final class AccessibilityUtilTest { private static final ComponentName DUMMY_COMPONENT_NAME2 = new ComponentName(DUMMY_PACKAGE_NAME, DUMMY_CLASS_NAME2); private static final String SOFTWARE_SHORTCUT_KEY = - Settings.Secure.ACCESSIBILITY_BUTTON_TARGET_COMPONENT; + Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS; private static final String HARDWARE_SHORTCUT_KEY = Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE; diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java index 6cf9ad6e433..10d8af78427 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java @@ -40,7 +40,7 @@ public class ToggleScreenMagnificationPreferenceFragmentTest { private static final ComponentName DUMMY_COMPONENT_NAME = new ComponentName(DUMMY_PACKAGE_NAME, DUMMY_CLASS_NAME); private static final String SOFTWARE_SHORTCUT_KEY = - Settings.Secure.ACCESSIBILITY_BUTTON_TARGET_COMPONENT; + Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS; private static final String HARDWARE_SHORTCUT_KEY = Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE; private static final String TRIPLETAP_SHORTCUT_KEY =