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

Merge "Fix inconsistent shortcut strings on accessibility setting and edit dialog" into tm-dev

Browse Source
This commit is contained in:
Menghan Li
2022-04-15 04:00:11 +00:00
committed by Android (Google) Code Review
parent fbafdbdd8f 50520c2d3f
commit 361d42afe5
7 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,8 +132,8 @@ public abstract class AccessibilityShortcutPreferenceFragment extends DashboardF
mShortcutPreference.setPersistent(false); mShortcutPreference.setPersistent(false);
mShortcutPreference.setKey(getShortcutPreferenceKey()); mShortcutPreference.setKey(getShortcutPreferenceKey());
mShortcutPreference.setOnClickCallback(this); mShortcutPreference.setOnClickCallback(this);
mShortcutPreference.setTitle(getShortcutTitle());
updateShortcutTitle(mShortcutPreference);
getPreferenceScreen().addPreference(mShortcutPreference); getPreferenceScreen().addPreference(mShortcutPreference);
mTouchExplorationStateChangeListener = isTouchExplorationEnabled -> { mTouchExplorationStateChangeListener = isTouchExplorationEnabled -> {
@@ -192,13 +192,11 @@ public abstract class AccessibilityShortcutPreferenceFragment extends DashboardF
final Dialog dialog; final Dialog dialog;
switch (dialogId) { switch (dialogId) {
case DialogEnums.EDIT_SHORTCUT: case DialogEnums.EDIT_SHORTCUT:
final CharSequence dialogTitle = getPrefContext().getString(
R.string.accessibility_shortcut_title, getLabelName());
final int dialogType = WizardManagerHelper.isAnySetupWizard(getIntent()) final int dialogType = WizardManagerHelper.isAnySetupWizard(getIntent())
? AccessibilityDialogUtils.DialogType.EDIT_SHORTCUT_GENERIC_SUW : ? AccessibilityDialogUtils.DialogType.EDIT_SHORTCUT_GENERIC_SUW :
AccessibilityDialogUtils.DialogType.EDIT_SHORTCUT_GENERIC; AccessibilityDialogUtils.DialogType.EDIT_SHORTCUT_GENERIC;
dialog = AccessibilityDialogUtils.showEditShortcutDialog( dialog = AccessibilityDialogUtils.showEditShortcutDialog(
getPrefContext(), dialogType, dialogTitle, getPrefContext(), dialogType, getShortcutTitle(),
this::callOnAlertDialogCheckboxClicked); this::callOnAlertDialogCheckboxClicked);
setupEditShortcutDialog(dialog); setupEditShortcutDialog(dialog);
return dialog; return dialog;
@@ -213,9 +211,8 @@ public abstract class AccessibilityShortcutPreferenceFragment extends DashboardF
} }
} }
protected void updateShortcutTitle(ShortcutPreference shortcutPreference) { protected CharSequence getShortcutTitle() {
final CharSequence title = getString(R.string.accessibility_shortcut_title, getLabelName()); return getString(R.string.accessibility_shortcut_title, getLabelName());
shortcutPreference.setTitle(title);
} }
@Override @Override

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

@@ -75,8 +75,8 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere
} }
@Override @Override
protected void updateShortcutTitle(ShortcutPreference shortcutPreference) { protected CharSequence getShortcutTitle() {
shortcutPreference.setTitle(R.string.accessibility_display_inversion_shortcut_title); return getText(R.string.accessibility_display_inversion_shortcut_title);
} }
@Override @Override

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

@@ -185,8 +185,8 @@ public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePrefe
} }
@Override @Override
protected void updateShortcutTitle(ShortcutPreference shortcutPreference) { protected CharSequence getShortcutTitle() {
shortcutPreference.setTitle(R.string.accessibility_daltonizer_shortcut_title); return getText(R.string.accessibility_daltonizer_shortcut_title);
} }
@Override @Override

12
src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
View File

@@ -271,12 +271,10 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
public Dialog onCreateDialog(int dialogId) { public Dialog onCreateDialog(int dialogId) {
switch (dialogId) { switch (dialogId) {
case DialogEnums.EDIT_SHORTCUT: case DialogEnums.EDIT_SHORTCUT:
final CharSequence dialogTitle = getPrefContext().getString(
R.string.accessibility_shortcut_title, mPackageName);
final int dialogType = WizardManagerHelper.isAnySetupWizard(getIntent()) final int dialogType = WizardManagerHelper.isAnySetupWizard(getIntent())
? DialogType.EDIT_SHORTCUT_GENERIC_SUW : DialogType.EDIT_SHORTCUT_GENERIC; ? DialogType.EDIT_SHORTCUT_GENERIC_SUW : DialogType.EDIT_SHORTCUT_GENERIC;
mDialog = AccessibilityDialogUtils.showEditShortcutDialog( mDialog = AccessibilityDialogUtils.showEditShortcutDialog(
getPrefContext(), dialogType, dialogTitle, getPrefContext(), dialogType, getShortcutTitle(),
this::callOnAlertDialogCheckboxClicked); this::callOnAlertDialogCheckboxClicked);
setupEditShortcutDialog(mDialog); setupEditShortcutDialog(mDialog);
return mDialog; return mDialog;
@@ -341,9 +339,8 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
switchPreference.setTitle(title); switchPreference.setTitle(title);
} }
protected void updateShortcutTitle(ShortcutPreference shortcutPreference) { protected CharSequence getShortcutTitle() {
final CharSequence title = getString(R.string.accessibility_shortcut_title, mPackageName); return getString(R.string.accessibility_shortcut_title, mPackageName);
shortcutPreference.setTitle(title);
} }
protected void onPreferenceToggled(String preferenceKey, boolean enabled) { protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
@@ -516,8 +513,7 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
mShortcutPreference.setPersistent(false); mShortcutPreference.setPersistent(false);
mShortcutPreference.setKey(getShortcutPreferenceKey()); mShortcutPreference.setKey(getShortcutPreferenceKey());
mShortcutPreference.setOnClickCallback(this); mShortcutPreference.setOnClickCallback(this);
mShortcutPreference.setTitle(getShortcutTitle());
updateShortcutTitle(mShortcutPreference);
final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY); final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY);
generalCategory.addPreference(mShortcutPreference); generalCategory.addPreference(mShortcutPreference);

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

@@ -168,8 +168,8 @@ public class ToggleReduceBrightColorsPreferenceFragment extends ToggleFeaturePre
} }
@Override @Override
protected void updateShortcutTitle(ShortcutPreference shortcutPreference) { protected CharSequence getShortcutTitle() {
shortcutPreference.setTitle(R.string.reduce_bright_colors_shortcut_title); return getText(R.string.reduce_bright_colors_shortcut_title);
} }
@Override @Override

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

@@ -479,8 +479,8 @@ public class ToggleScreenMagnificationPreferenceFragment extends
} }
@Override @Override
protected void updateShortcutTitle(ShortcutPreference shortcutPreference) { protected CharSequence getShortcutTitle() {
shortcutPreference.setTitle(R.string.accessibility_screen_magnification_shortcut_title); return getText(R.string.accessibility_screen_magnification_shortcut_title);
} }
@Override @Override

5
src/com/android/settings/gestures/OneHandedSettings.java
View File

@@ -27,7 +27,6 @@ import com.android.internal.accessibility.AccessibilityShortcutController;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment; import com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType; import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
import com.android.settings.accessibility.ShortcutPreference;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.widget.IllustrationPreference; import com.android.settingslib.widget.IllustrationPreference;
import com.android.settingslib.widget.MainSwitchPreference; import com.android.settingslib.widget.MainSwitchPreference;
@@ -88,8 +87,8 @@ public class OneHandedSettings extends AccessibilityShortcutPreferenceFragment {
} }
@Override @Override
protected void updateShortcutTitle(ShortcutPreference shortcutPreference) { protected CharSequence getShortcutTitle() {
shortcutPreference.setTitle(R.string.one_handed_mode_shortcut_title); return getText(R.string.one_handed_mode_shortcut_title);
} }
@Override @Override