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

Merge "Revert "Remove duplicate strings."" into udc-dev

Browse Source
This commit is contained in:
Kweku Adams
2023-03-16 20:14:16 +00:00
committed by Android (Google) Code Review
parent fe310a86de caa1b51ef2
commit 9a087d6c19
70 changed files with 221 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/notification/BubbleSummaryNotificationPreferenceController.java
View File

@@ -44,7 +44,7 @@ public class BubbleSummaryNotificationPreferenceController extends BasePreferenc
return mContext.getString(
areBubblesEnabled()
? R.string.notifications_bubble_setting_on_summary
: R.string.off);
: R.string.switch_off_text);
}
@Override

2
src/com/android/settings/notification/SpatialAudioParentPreferenceController.java
View File

@@ -71,7 +71,7 @@ public class SpatialAudioParentPreferenceController extends BasePreferenceContro
return mContext.getString(R.string.spatial_summary_on_one,
mContext.getString(R.string.spatial_audio_wired_headphones));
} else {
return mContext.getString(R.string.off);
return mContext.getString(R.string.spatial_summary_off);
}
}
}

2
src/com/android/settings/notification/zen/ZenModeSettings.java
View File

@@ -194,7 +194,7 @@ public class ZenModeSettings extends ZenModeSettingsBase {
String description = ZenModeConfig.getDescription(mContext, true, config, false);
if (description == null) {
return mContext.getString(R.string.on);
return mContext.getString(R.string.zen_mode_sound_summary_on);
} else {
return mContext.getString(R.string.zen_mode_sound_summary_on_with_info,
description);

2
src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceController.java
View File

@@ -274,7 +274,7 @@ public class ZenModeSettingsFooterPreferenceController extends AbstractZenModePr
}
private int getAllowRes(boolean allow) {
return allow ? R.string.on : R.string.off;
return allow ? R.string.zen_mode_sound_summary_on : R.string.switch_off_text;
}
@Override

4
src/com/android/settings/notification/zen/ZenRulePreference.java
View File

@@ -165,7 +165,7 @@ public class ZenRulePreference extends PrimarySwitchPreference {
}
return (rule == null || !rule.isEnabled())
? mContext.getResources().getString(R.string.off)
: mContext.getResources().getString(R.string.on);
? mContext.getResources().getString(R.string.switch_off_text)
: mContext.getResources().getString(R.string.switch_on_text);
}
}