diff options
| author | Jason Hsu <jasonwshsu@google.com> | 2020-04-24 03:07:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-24 03:07:39 +0000 |
| commit | 79d73eaa598270b210a2b8e936750531575963fd (patch) | |
| tree | bbf3ff1d290637330351a6db93af6de4d0665ddf /src/com/android/settings/accessibility | |
| parent | 4908511b17924e2bf90ea698f49f4962199c05d6 (diff) | |
| parent | e1eec164275a84c962b1930ba0d1d6a2b3a15f9d (diff) | |
| download | packages_apps_Settings-79d73eaa598270b210a2b8e936750531575963fd.tar.gz packages_apps_Settings-79d73eaa598270b210a2b8e936750531575963fd.tar.bz2 packages_apps_Settings-79d73eaa598270b210a2b8e936750531575963fd.zip | |
Merge "Use new setting key to maintain the list of user assigned shortcut targets." into rvc-dev
Diffstat (limited to 'src/com/android/settings/accessibility')
3 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index 3d47ca8dd8..becd4e78b0 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -192,7 +192,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 ce0b5fb4b3..a0e3d81403 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 0e6d3becc5..d589f0f03d 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); |