Merge "Fix inconsistent shortcut strings on accessibility setting and edit dialog" into tm-dev (361d42af) · Commits · e / os / android_packages_apps_Settings

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

+4 −7

Original line number	Diff line number	Diff line
		@@ -132,8 +132,8 @@ public abstract class AccessibilityShortcutPreferenceFragment extends DashboardF
		mShortcutPreference.setPersistent(false);
		mShortcutPreference.setKey(getShortcutPreferenceKey());
		mShortcutPreference.setOnClickCallback(this);
		mShortcutPreference.setTitle(getShortcutTitle());

		updateShortcutTitle(mShortcutPreference);
		getPreferenceScreen().addPreference(mShortcutPreference);

		mTouchExplorationStateChangeListener = isTouchExplorationEnabled -> {
		@@ -192,13 +192,11 @@ public abstract class AccessibilityShortcutPreferenceFragment extends DashboardF
		final Dialog dialog;
		switch (dialogId) {
		case DialogEnums.EDIT_SHORTCUT:
		final CharSequence dialogTitle = getPrefContext().getString(
		R.string.accessibility_shortcut_title, getLabelName());
		final int dialogType = WizardManagerHelper.isAnySetupWizard(getIntent())
		? AccessibilityDialogUtils.DialogType.EDIT_SHORTCUT_GENERIC_SUW :
		AccessibilityDialogUtils.DialogType.EDIT_SHORTCUT_GENERIC;
		dialog = AccessibilityDialogUtils.showEditShortcutDialog(
		getPrefContext(), dialogType, dialogTitle,
		getPrefContext(), dialogType, getShortcutTitle(),
		this::callOnAlertDialogCheckboxClicked);
		setupEditShortcutDialog(dialog);
		return dialog;
		@@ -213,9 +211,8 @@ public abstract class AccessibilityShortcutPreferenceFragment extends DashboardF
		}
		}

		protected void updateShortcutTitle(ShortcutPreference shortcutPreference) {
		final CharSequence title = getString(R.string.accessibility_shortcut_title, getLabelName());
		shortcutPreference.setTitle(title);
		protected CharSequence getShortcutTitle() {
		return getString(R.string.accessibility_shortcut_title, getLabelName());
		}

		@Override

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -75,8 +75,8 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere
		}

		@Override
		protected void updateShortcutTitle(ShortcutPreference shortcutPreference) {
		shortcutPreference.setTitle(R.string.accessibility_display_inversion_shortcut_title);
		protected CharSequence getShortcutTitle() {
		return getText(R.string.accessibility_display_inversion_shortcut_title);
		}

		@Override

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -185,8 +185,8 @@ public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePrefe
		}

		@Override
		protected void updateShortcutTitle(ShortcutPreference shortcutPreference) {
		shortcutPreference.setTitle(R.string.accessibility_daltonizer_shortcut_title);
		protected CharSequence getShortcutTitle() {
		return getText(R.string.accessibility_daltonizer_shortcut_title);
		}

		@Override

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

+4 −8

Original line number	Diff line number	Diff line
		@@ -271,12 +271,10 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
		public Dialog onCreateDialog(int dialogId) {
		switch (dialogId) {
		case DialogEnums.EDIT_SHORTCUT:
		final CharSequence dialogTitle = getPrefContext().getString(
		R.string.accessibility_shortcut_title, mPackageName);
		final int dialogType = WizardManagerHelper.isAnySetupWizard(getIntent())
		? DialogType.EDIT_SHORTCUT_GENERIC_SUW : DialogType.EDIT_SHORTCUT_GENERIC;
		mDialog = AccessibilityDialogUtils.showEditShortcutDialog(
		getPrefContext(), dialogType, dialogTitle,
		getPrefContext(), dialogType, getShortcutTitle(),
		this::callOnAlertDialogCheckboxClicked);
		setupEditShortcutDialog(mDialog);
		return mDialog;
		@@ -341,9 +339,8 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
		switchPreference.setTitle(title);
		}

		protected void updateShortcutTitle(ShortcutPreference shortcutPreference) {
		final CharSequence title = getString(R.string.accessibility_shortcut_title, mPackageName);
		shortcutPreference.setTitle(title);
		protected CharSequence getShortcutTitle() {
		return getString(R.string.accessibility_shortcut_title, mPackageName);
		}

		protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
		@@ -516,8 +513,7 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
		mShortcutPreference.setPersistent(false);
		mShortcutPreference.setKey(getShortcutPreferenceKey());
		mShortcutPreference.setOnClickCallback(this);

		updateShortcutTitle(mShortcutPreference);
		mShortcutPreference.setTitle(getShortcutTitle());

		final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY);
		generalCategory.addPreference(mShortcutPreference);

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -168,8 +168,8 @@ public class ToggleReduceBrightColorsPreferenceFragment extends ToggleFeaturePre
		}

		@Override
		protected void updateShortcutTitle(ShortcutPreference shortcutPreference) {
		shortcutPreference.setTitle(R.string.reduce_bright_colors_shortcut_title);
		protected CharSequence getShortcutTitle() {
		return getText(R.string.reduce_bright_colors_shortcut_title);
		}

		@Override