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

Commit ed69e8a4 authored by Phil Weaver's avatar Phil Weaver
Browse files

Respect user's choice on a11y shortcut dialog 

Wasn't checking if the user actually agreed. Whoops.

Bug: 37123004
Test: Manually verified that canceling leaves the selection
unchanged.

Change-Id: I48a052eb74733d3d0105fc1e72c4bf77ce8be0c5
parent a0e617f9

src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java

+0 −3
Original line number Diff line number Diff line
@@ -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() {

src/com/android/settings/accessibility/ShortcutServicePickerFragment.java

+3 −1
Original line number Diff line number Diff line
@@ -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));