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

Merge "Cosmetic changes to zen mode people & sound/vibration screens"

Browse Source
This commit is contained in:
Yuri Lin
2022-01-31 16:00:50 +00:00
committed by Android (Google) Code Review
parent 7e324bb603 0a7554acfa
commit 17c47f1447
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -9752,6 +9752,9 @@
setting page --> setting page -->
<string name="zen_mode_people_calls_messages_section_title" translatable="false">Who can reach you</string> <string name="zen_mode_people_calls_messages_section_title" translatable="false">Who can reach you</string>
<!-- [CHAR LIMIT=NONE] Zen mode settings: people screen footer -->
<string name="zen_mode_people_footer" translatable="false">Even if messaging or calling apps can\u0027t notify you, people you choose here can still reach you through those apps</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Allow calls toggle title --> <!-- [CHAR LIMIT=40] Zen mode settings: Allow calls toggle title -->
<string name="zen_mode_calls_title">Calls</string> <string name="zen_mode_calls_title">Calls</string>
<!-- [CHAR LIMIT=20] Zen mode settings: Calls option --> <!-- [CHAR LIMIT=20] Zen mode settings: Calls option -->

1
res/xml/zen_mode_people_settings.xml
View File

@@ -37,7 +37,6 @@
</PreferenceCategory> </PreferenceCategory>
<!-- Footer that shows if user is put into alarms only or total silence mode by an app -->
<com.android.settingslib.widget.FooterPreference/> <com.android.settingslib.widget.FooterPreference/>
</PreferenceScreen> </PreferenceScreen>

1
res/xml/zen_mode_sound_vibration_settings.xml
View File

@@ -20,7 +20,6 @@
android:title="@string/zen_category_exceptions" > android:title="@string/zen_category_exceptions" >
<PreferenceCategory <PreferenceCategory
android:title="@string/zen_mode_settings_category"
android:key="zen_mode_settings_category_sound_vibration"> android:key="zen_mode_settings_category_sound_vibration">
<!-- Alarms --> <!-- Alarms -->

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

@@ -60,8 +60,8 @@ public class ZenModePeopleSettings extends ZenModeSettingsBase implements Indexa
"zen_mode_people_calls")); "zen_mode_people_calls"));
controllers.add(new ZenModeMessagesPreferenceController(context, lifecycle, controllers.add(new ZenModeMessagesPreferenceController(context, lifecycle,
"zen_mode_people_messages")); "zen_mode_people_messages"));
controllers.add(new ZenModeSettingsFooterPreferenceController(context, lifecycle, controllers.add(new ZenModeBehaviorFooterPreferenceController(context, lifecycle,
fragmentManager)); R.string.zen_mode_people_footer));
return controllers; return controllers;
} }