Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a7554ac authored by Yuri Lin's avatar Yuri Lin
Browse files

Cosmetic changes to zen mode people & sound/vibration screens 

On the people screen, have the footer show up all the time and provide a more relevant message (indicating that the chosen people override any app/etc settings) than the current setting.

On the sound/vibration screen, remove the sub-title since it's a bit confusing what exactly is being turned on or off.

Bug: 190180868
Bug: 215564123
Test: manual
Change-Id: I78d407af350a9f99d26d1e5082b752881bd3f186
parent a91e2dae

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -9741,6 +9741,9 @@ 
    setting page -->

    <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 -->















    <string name="zen_mode_calls_title">Calls</string>















    <!-- [CHAR LIMIT=20] Zen mode settings: Calls option -->

























res/xml/zen_mode_people_settings.xml



+0
−1




























Original line number
Diff line number
Diff line








@@ -37,7 +37,6 @@





























   </PreferenceCategory>





























   <!-- Footer that shows if user is put into alarms only or total silence mode by an app -->















   <com.android.settingslib.widget.FooterPreference/>































</PreferenceScreen>
























res/xml/zen_mode_sound_vibration_settings.xml



+0
−1




























Original line number
Diff line number
Diff line








@@ -20,7 +20,6 @@













    android:title="@string/zen_category_exceptions" >































    <PreferenceCategory













        android:title="@string/zen_mode_settings_category"















        android:key="zen_mode_settings_category_sound_vibration">































        <!-- Alarms -->

































src/com/android/settings/notification/zen/ZenModePeopleSettings.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -60,8 +60,8 @@ public class ZenModePeopleSettings extends ZenModeSettingsBase implements Indexa













                "zen_mode_people_calls"));















        controllers.add(new ZenModeMessagesPreferenceController(context, lifecycle,















                "zen_mode_people_messages"));













        controllers.add(new ZenModeSettingsFooterPreferenceController(context, lifecycle,













                fragmentManager));













        controllers.add(new ZenModeBehaviorFooterPreferenceController(context, lifecycle,













                R.string.zen_mode_people_footer));















        return controllers;















    }