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

This commit is contained in:
Menghan Li
2022-04-15 04:00:11 +00:00
committed by Android (Google) Code Review
7 changed files with 18 additions and 26 deletions

View File

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