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

Commit 68084f39 authored by Jason Hsu's avatar Jason Hsu Committed by Android (Google) Code Review
Browse files

Merge "Show empty options in shortcut chooser dialog if shortPreference is unchecked." into rvc-dev

parents 8c858cf5 bfc3201e

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

+10 −5
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference 
    protected CharSequence mPackageName;

    protected Uri mImageUri;

    protected CharSequence mHtmlDescription;

    // Used to restore the edit dialog status.

    protected int mUserShortcutTypeCache = UserShortcutType.EMPTY;

    private static final String DRAWABLE_FOLDER = "drawable";

    protected static final String KEY_USE_SERVICE_PREFERENCE = "use_service";

    protected static final String KEY_GENERAL_CATEGORY = "general_categories";
@@ -91,8 +93,6 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference 
    private static final String EXTRA_SHORTCUT_TYPE = "shortcut_type";

    private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;

    private int mUserShortcutType = UserShortcutType.EMPTY;

    // Used to restore the edit dialog status.

    private int mUserShortcutTypeCache = UserShortcutType.EMPTY;

    private CheckBox mSoftwareTypeCheckBox;

    private CheckBox mHardwareTypeCheckBox;
@@ -473,9 +473,11 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference 
    }



    private void updateAlertDialogCheckState() {

        if (mUserShortcutTypeCache != UserShortcutType.EMPTY) {

            updateCheckStatus(mSoftwareTypeCheckBox, UserShortcutType.SOFTWARE);

            updateCheckStatus(mHardwareTypeCheckBox, UserShortcutType.HARDWARE);

        }

    }



    private void updateCheckStatus(CheckBox checkBox, @UserShortcutType int type) {

        checkBox.setChecked((mUserShortcutTypeCache & type) == type);
@@ -658,7 +660,10 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference 


    @Override

    public void onSettingsClicked(ShortcutPreference preference) {

        mUserShortcutTypeCache = getUserShortcutType(getPrefContext(), UserShortcutType.SOFTWARE);

        // Do not restore shortcut in shortcut chooser dialog when shortcutPreference is turned off.

        mUserShortcutTypeCache = mShortcutPreference.isChecked()

                ? getUserShortcutType(getPrefContext(), UserShortcutType.SOFTWARE)

                : UserShortcutType.EMPTY;

    }



    private void createFooterPreference(CharSequence title) {

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

+9 −6
Original line number Diff line number Diff line
@@ -71,8 +71,6 @@ public class ToggleScreenMagnificationPreferenceFragment extends 
    private static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference";

    private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;

    private int mUserShortcutType = UserShortcutType.EMPTY;

    // Used to restore the edit dialog status.

    private int mUserShortcutTypeCache = UserShortcutType.EMPTY;

    private CheckBox mSoftwareTypeCheckBox;

    private CheckBox mHardwareTypeCheckBox;

    private CheckBox mTripleTapTypeCheckBox;
@@ -283,10 +281,12 @@ public class ToggleScreenMagnificationPreferenceFragment extends 
    }



    private void updateAlertDialogCheckState() {

        if (mUserShortcutTypeCache != UserShortcutType.EMPTY) {

            updateCheckStatus(mSoftwareTypeCheckBox, UserShortcutType.SOFTWARE);

            updateCheckStatus(mHardwareTypeCheckBox, UserShortcutType.HARDWARE);

            updateCheckStatus(mTripleTapTypeCheckBox, UserShortcutType.TRIPLETAP);

        }

    }



    private void updateCheckStatus(CheckBox checkBox, @UserShortcutType int type) {

        checkBox.setChecked((mUserShortcutTypeCache & type) == type);
@@ -457,7 +457,10 @@ public class ToggleScreenMagnificationPreferenceFragment extends 


    @Override

    public void onSettingsClicked(ShortcutPreference preference) {

        mUserShortcutTypeCache = getUserShortcutType(getPrefContext(), UserShortcutType.SOFTWARE);

        // Do not restore shortcut in shortcut chooser dialog when shortcutPreference is turned off.

        mUserShortcutTypeCache = mShortcutPreference.isChecked()

                ? getUserShortcutType(getPrefContext(), UserShortcutType.SOFTWARE)

                : UserShortcutType.EMPTY;

        showDialog(DialogEnums.MAGNIFICATION_EDIT_SHORTCUT);

    }