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

Commit 9f6e77a0 authored by Daniel Norman's avatar Daniel Norman
Browse files

Minor refactoring to replace duplicated logic with existing methods. 

Bug: 303511250
Test: tested in child change in the topic
Change-Id: I0995ce5fc685257ba69f7e4aa733de74aeb1fde3
parent a909150e

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

+16 −12
Original line number Diff line number Diff line
@@ -336,9 +336,7 @@ public class ToggleAccessibilityServicePreferenceFragment extends 
                preference.setChecked(false);

                showPopupDialog(DialogEnums.ENABLE_WARNING_FROM_SHORTCUT_TOGGLE);

            } else {

                AccessibilityUtil.optInAllValuesToSettings(getPrefContext(), shortcutTypes,

                        mComponentName);

                showPopupDialog(DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL);

                onAllowButtonFromShortcutToggleClicked();

            }

        } else {

            AccessibilityUtil.optOutAllValuesFromSettings(getPrefContext(), shortcutTypes,
@@ -351,8 +349,11 @@ public class ToggleAccessibilityServicePreferenceFragment extends 
    public void onSettingsClicked(ShortcutPreference preference) {

        final boolean isServiceOnOrShortcutAdded = mShortcutPreference.isChecked()

                || mToggleServiceSwitchPreference.isChecked();

        showPopupDialog(isServiceOnOrShortcutAdded ? DialogEnums.EDIT_SHORTCUT

                : DialogEnums.ENABLE_WARNING_FROM_SHORTCUT);

        if (!isServiceOnOrShortcutAdded) {

            showPopupDialog(DialogEnums.ENABLE_WARNING_FROM_SHORTCUT);

        } else {

            onAllowButtonFromShortcutClicked();

        }

    }



    @Override
@@ -467,8 +468,10 @@ public class ToggleAccessibilityServicePreferenceFragment extends 
            mIsDialogShown.set(false);

            showPopupDialog(DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL);

        }

        if (mWarningDialog != null) {

            mWarningDialog.dismiss();

        }

    }



    private void onDenyButtonFromEnableToggleClicked() {

        handleConfirmServiceEnabled(/* confirmed= */ false);
@@ -496,7 +499,9 @@ public class ToggleAccessibilityServicePreferenceFragment extends 
        mIsDialogShown.set(false);

        showPopupDialog(DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL);



        if (mWarningDialog != null) {

            mWarningDialog.dismiss();

        }



        mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));

    }
@@ -522,8 +527,10 @@ public class ToggleAccessibilityServicePreferenceFragment extends 
        mIsDialogShown.set(false);

        showPopupDialog(DialogEnums.EDIT_SHORTCUT);



        if (mWarningDialog != null) {

            mWarningDialog.dismiss();

        }

    }



    private void onDenyButtonFromShortcutClicked() {

        mWarningDialog.dismiss();
@@ -537,10 +544,7 @@ public class ToggleAccessibilityServicePreferenceFragment extends 
            if (!mShortcutPreference.isChecked()) {

                showPopupDialog(DialogEnums.ENABLE_WARNING_FROM_TOGGLE);

            } else {

                handleConfirmServiceEnabled(/* confirmed= */ true);

                if (serviceSupportsAccessibilityButton()) {

                    showPopupDialog(DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL);

                }

                onAllowButtonFromEnableToggleClicked();

            }

        } else {

            mToggleServiceSwitchPreference.setChecked(true);