diff options
| author | Phil Weaver <pweaver@google.com> | 2017-04-19 16:16:14 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-19 16:16:14 +0000 |
| commit | e9edc8f357325f4f3a1379f283909be3b1b503c1 (patch) | |
| tree | caf2ad1fd39ed4fbb1ba2a6e738d8c91212b5479 /src/com/android/settings/accessibility | |
| parent | 9c93ad44a4c0c58e3eeaa09d1ad7c0fcf7222cf3 (diff) | |
| parent | 8a3d606a60064b7ae6b3b23d61d3a6acd98faa6e (diff) | |
| download | packages_apps_Settings-e9edc8f357325f4f3a1379f283909be3b1b503c1.tar.gz packages_apps_Settings-e9edc8f357325f4f3a1379f283909be3b1b503c1.tar.bz2 packages_apps_Settings-e9edc8f357325f4f3a1379f283909be3b1b503c1.zip | |
Merge "Respect user's choice on a11y shortcut dialog" into oc-dev am: d4ce883c64
am: 8a3d606a60
Change-Id: Id39f650645400b4e5076ea0a9cd86925244e76d5
Diffstat (limited to 'src/com/android/settings/accessibility')
| -rw-r--r-- | src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java | 3 | ||||
| -rw-r--r-- | src/com/android/settings/accessibility/ShortcutServicePickerFragment.java | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java index 6ed06da768..24320b393a 100644 --- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java @@ -42,12 +42,9 @@ public class AccessibilityShortcutPreferenceFragment extends ToggleFeaturePrefer public static final String SHORTCUT_SERVICE_KEY = "accessibility_shortcut_service"; public static final String ON_LOCK_SCREEN_KEY = "accessibility_shortcut_on_lock_screen"; - // ID for dialog that confirms shortcut capabilities - private static final int DIALOG_ID_ADD_SHORTCUT_WARNING = 1; private Preference mServicePreference; private SwitchPreference mOnLockScreenSwitchPreference; - private String mSelectedServiceComponentNameString; @Override public int getMetricsCategory() { diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java index 8b6d52a567..3250521543 100644 --- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java +++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java @@ -15,6 +15,8 @@ */ package com.android.settings.accessibility; +import static android.content.DialogInterface.BUTTON_POSITIVE; + import android.accessibilityservice.AccessibilityServiceInfo; import android.app.Activity; import android.app.AlertDialog; @@ -147,7 +149,7 @@ public class ShortcutServicePickerFragment extends DefaultAppPickerFragment { @Override public void onClick(DialogInterface dialog, int which) { final Fragment fragment = getTargetFragment(); - if (fragment instanceof DefaultAppPickerFragment) { + if ((which == BUTTON_POSITIVE) && (fragment instanceof DefaultAppPickerFragment)) { final Bundle bundle = getArguments(); ((ShortcutServicePickerFragment) fragment).onServiceConfirmed( bundle.getString(EXTRA_KEY)); |