From 7fb0c3308ed37fcdfed5278f9c145385e6b843df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Hern=C3=A1ndez?= Date: Tue, 25 Jun 2024 16:48:31 +0200 Subject: [PATCH] Adjust strings in modes list to match latest mocks Bug: 346575288 Test: atest ZenModesListItemPreferenceTest Flag: android.app.modes_ui Change-Id: Ibe9c049ed0fb3b1838866b923a6227d67885c75c --- res/values/strings.xml | 6 +++--- .../notification/modes/ZenModesListItemPreference.java | 2 +- .../notification/modes/ZenModesListItemPreferenceTest.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index ed9341d6a23..b231927dc3c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -7946,11 +7946,11 @@ %1$s%2$s - - Tap to set up + + Not set - Paused + Disabled Limit interruptions diff --git a/src/com/android/settings/notification/modes/ZenModesListItemPreference.java b/src/com/android/settings/notification/modes/ZenModesListItemPreference.java index 1bc6e55acce..261ab1d60c5 100644 --- a/src/com/android/settings/notification/modes/ZenModesListItemPreference.java +++ b/src/com/android/settings/notification/modes/ZenModesListItemPreference.java @@ -79,7 +79,7 @@ class ZenModesListItemPreference extends RestrictedPreference { mZenMode.getRule().getTriggerDescription()); case ENABLED -> mZenMode.getRule().getTriggerDescription(); 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); diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModesListItemPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModesListItemPreferenceTest.java index 495a24c8c34..aaf70595132 100644 --- a/tests/robotests/src/com/android/settings/notification/modes/ZenModesListItemPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModesListItemPreferenceTest.java @@ -100,7 +100,7 @@ public class ZenModesListItemPreferenceTest { ShadowLooper.idleMainLooper(); 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(); } @@ -120,7 +120,7 @@ public class ZenModesListItemPreferenceTest { ShadowLooper.idleMainLooper(); assertThat(preference.getTitle()).isEqualTo("Mode disabled by user"); - assertThat(preference.getSummary()).isEqualTo("Paused"); + assertThat(preference.getSummary()).isEqualTo("Disabled"); assertThat(preference.getIcon()).isNotNull(); } }