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

Update text on notification on/off toggles for clarity

Browse Source 
Test: manual
Fixes: 141011559
Change-Id: I06b8519bb5a80496d84889f8c5264bff098ebefd
This commit is contained in:
Julia Reynolds
2019-11-11 10:23:04 -05:00
parent bfe25c3b29
commit 78b4505d6e
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@@ -6756,9 +6756,6 @@
<!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
<string name="restriction_menu_change_pin">Change PIN</string>
<!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
<string name="app_notifications_switch_label">Show notifications</string>
<!-- Help URLs for some screens. Not specified here. Specified in product overlays --><skip/>
<!-- Help menu label [CHAR LIMIT=20] -->
<string name="help_label">Help &amp; feedback</string>
@@ -8026,7 +8023,7 @@
<string name="notification_channel_summary_high">When device is unlocked, show notifications as a banner across the top of the screen</string>
<!-- [CHAR LIMIT=100] Label for on/off toggle -->
<string name="notification_switch_label">Show notifications</string>
<string name="notification_switch_label">All <xliff:g id="app_name" example="Android Services">%1$s</xliff:g> notifications</string>
<!-- Default Apps > Default notification assistant -->
<string name="default_notification_assistant">Adaptive Notifications</string>

18
src/com/android/settings/notification/BlockPreferenceController.java
View File

@@ -62,8 +62,8 @@ public class BlockPreferenceController extends NotificationPreferenceController
pref.setSelectable(false);
SwitchBar bar = pref.findViewById(R.id.switch_bar);
if (bar != null) {
bar.setSwitchBarText(R.string.notification_switch_label,
R.string.notification_switch_label);
String switchBarText = getSwitchBarText();
bar.setSwitchBarText(switchBarText, switchBarText);
bar.show();
try {
bar.addOnSwitchChangeListener(this);
@@ -125,4 +125,18 @@ public class BlockPreferenceController extends NotificationPreferenceController
}
mImportanceListener.onImportanceChanged();
}
String getSwitchBarText() {
if (mChannel != null) {
return mContext.getString(R.string.notification_content_block_title);
} else {
CharSequence fieldContextName;
if (mChannelGroup != null) {
fieldContextName = mChannelGroup.getName();
} else {
fieldContextName = mAppRow.label;
}
return mContext.getString(R.string.notification_switch_label, fieldContextName);
}
}
}

3
src/com/android/settings/notification/ChannelListPreferenceController.java
View File

@@ -156,7 +156,8 @@ public class ChannelListPreferenceController extends NotificationPreferenceContr
NotificationChannelGroup group) {
RestrictedSwitchPreference preference =
new RestrictedSwitchPreference(mContext);
preference.setTitle(R.string.notification_switch_label);
preference.setTitle(mContext.getString(
R.string.notification_switch_label, group.getName()));
preference.setEnabled(mAdmin == null
&& isChannelGroupBlockable(group));
preference.setChecked(!group.isBlocked());