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

Merge "Adjust strings in modes list to match latest mocks" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-06-25 16:07:07 +00:00
committed by Android (Google) Code Review
parent 9bf762bfdd 7fb0c3308e
commit 40b6a49287
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -7985,11 +7985,11 @@
<!-- Priority Modes: Format string for the "current state + trigger description summary for rules in the list. [CHAR_LIMIT=10] --> <!-- Priority Modes: Format string for the "current state + trigger description summary for rules in the list. [CHAR_LIMIT=10] -->
<string name="zen_mode_format_status_and_trigger" translatable="false"><xliff:g id="current_status" example="ON">%1$s</xliff:g> • <xliff:g id="trigger_description" example="Mon-Fri, 23:00-7:00">%2$s</xliff:g></string> <string name="zen_mode_format_status_and_trigger" translatable="false"><xliff:g id="current_status" example="ON">%1$s</xliff:g> • <xliff:g id="trigger_description" example="Mon-Fri, 23:00-7:00">%2$s</xliff:g></string>
<!-- Priority Modes: Call to action for a mode that is disabled and needs to be configured. [CHAR_LIMIT=40] --> <!-- Priority Modes: Indicates that a mode is disabled and needs to be configured. [CHAR_LIMIT=40] -->
<string name="zen_mode_disabled_tap_to_set_up">Tap to set up</string> <string name="zen_mode_disabled_needs_setup">Not set</string>
<!-- Priority Modes: Indicates that a mode is disabled by the user. [CHAR_LIMIT=40] --> <!-- Priority Modes: Indicates that a mode is disabled by the user. [CHAR_LIMIT=40] -->
<string name="zen_mode_disabled_by_user">Paused</string> <string name="zen_mode_disabled_by_user">Disabled</string>
<!-- Subtitle for the Do not Disturb slice. [CHAR LIMIT=50]--> <!-- Subtitle for the Do not Disturb slice. [CHAR LIMIT=50]-->
<string name="zen_mode_slice_subtitle">Limit interruptions</string> <string name="zen_mode_slice_subtitle">Limit interruptions</string>

2
src/com/android/settings/notification/modes/ZenModesListItemPreference.java
View File

@@ -79,7 +79,7 @@ class ZenModesListItemPreference extends RestrictedPreference {
mZenMode.getRule().getTriggerDescription()); mZenMode.getRule().getTriggerDescription());
case ENABLED -> mZenMode.getRule().getTriggerDescription(); case ENABLED -> mZenMode.getRule().getTriggerDescription();
case DISABLED_BY_USER -> mContext.getString(R.string.zen_mode_disabled_by_user); case DISABLED_BY_USER -> mContext.getString(R.string.zen_mode_disabled_by_user);
case DISABLED_BY_OTHER -> mContext.getString(R.string.zen_mode_disabled_tap_to_set_up); case DISABLED_BY_OTHER -> mContext.getString(R.string.zen_mode_disabled_needs_setup);
}; };
setSummary(statusText); setSummary(statusText);

4
tests/robotests/src/com/android/settings/notification/modes/ZenModesListItemPreferenceTest.java
View File

@@ -100,7 +100,7 @@ public class ZenModesListItemPreferenceTest {
ShadowLooper.idleMainLooper(); ShadowLooper.idleMainLooper();
assertThat(preference.getTitle()).isEqualTo("Mode disabled by app"); assertThat(preference.getTitle()).isEqualTo("Mode disabled by app");
assertThat(preference.getSummary()).isEqualTo("Tap to set up"); assertThat(preference.getSummary()).isEqualTo("Not set");
assertThat(preference.getIcon()).isNotNull(); assertThat(preference.getIcon()).isNotNull();
} }
@@ -120,7 +120,7 @@ public class ZenModesListItemPreferenceTest {
ShadowLooper.idleMainLooper(); ShadowLooper.idleMainLooper();
assertThat(preference.getTitle()).isEqualTo("Mode disabled by user"); assertThat(preference.getTitle()).isEqualTo("Mode disabled by user");
assertThat(preference.getSummary()).isEqualTo("Paused"); assertThat(preference.getSummary()).isEqualTo("Disabled");
assertThat(preference.getIcon()).isNotNull(); assertThat(preference.getIcon()).isNotNull();
} }
} }