PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Respect user's choice on a11y shortcut dialog" into oc-dev

Browse Source
This commit is contained in:
Phil Weaver
2017-04-19 16:09:15 +00:00
committed by Android (Google) Code Review
parent eb62407114 ed69e8a417
commit d4ce883c64
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
View File

@@ -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() {

4
src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
View File

@@ -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));