Revert "Remove duplicate strings."

Revert submission 19748582-settings_yesno

Reason for revert: Common strings in English could be translated into different strings in other languages.

Reverted changes: /q/submissionid:19748582-settings_yesno

Bug: 272603842
Test: build and open Settings app
Test: atest SettingsRoboTests
Change-Id: Iaad301c5513478fb95e40987ea3ccb4f923d71fa
This commit is contained in:
Lifu Tang
2023-03-15 21:37:02 +00:00
committed by Kweku Adams
parent 36d78f8fe0
commit caa1b51ef2
70 changed files with 221 additions and 113 deletions

View File

@@ -128,7 +128,8 @@ public class AssistGestureSettingsPreferenceController extends GesturePreference
if (!mAssistOnly) {
isEnabled = isEnabled || isSilenceGestureEnabled();
}
return mContext.getText(isEnabled ? R.string.on : R.string.off);
return mContext.getText(
isEnabled ? R.string.gesture_setting_on : R.string.gesture_setting_off);
}
@Override

View File

@@ -60,7 +60,8 @@ public abstract class GesturePreferenceController extends TogglePreferenceContro
@Override
public CharSequence getSummary() {
return mContext.getText(isChecked() ? R.string.on : R.string.off);
return mContext.getText(
isChecked() ? R.string.gesture_setting_on : R.string.gesture_setting_off);
}
@Override

View File

@@ -51,7 +51,7 @@ public class OneHandedEnablePreferenceController extends BasePreferenceControlle
public CharSequence getSummary() {
return mContext.getText(
OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)
? R.string.on : R.string.off);
? R.string.gesture_setting_on : R.string.gesture_setting_off);
}
@Override

View File

@@ -104,7 +104,7 @@ public class PreventRingingParentPreferenceController extends TogglePreferenceCo
break;
// VOLUME_HUSH_OFF
default:
summary = mContext.getText(R.string.off);
summary = mContext.getText(R.string.switch_off_text);
}
preference.setEnabled(true);
mPreference.setSwitchEnabled(true);