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

Merge "Settings: Allow user to configure "None" for downtime." into lmp-mr1-dev

Browse Source
This commit is contained in:
John Spurlock
2014-11-05 19:17:49 +00:00
committed by Android (Google) Code Review
parent 63530b56bb 645cc5cf82
commit 92f02463fc
3 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/values/strings.xml
View File

@@ -5822,7 +5822,7 @@
<string name="zen_mode_important_category">Priority interruptions</string>
<!-- [CHAR LIMIT=60] Zen mode settings: Downtime category text -->
<string name="zen_mode_downtime_category">Downtime (priority interruptions only)</string>
<string name="zen_mode_downtime_category">Downtime</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option title -->
<string name="zen_mode_downtime_days">Days</string>
@@ -5830,6 +5830,15 @@
<!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, no days set -->
<string name="zen_mode_downtime_days_none">None</string>
<!-- [CHAR LIMIT=60] Zen mode settings: Downtime mode option title -->
<string name="zen_mode_downtime_mode_title">Interruptions allowed</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Downtime mode option value, priority only -->
<string name="zen_mode_downtime_mode_priority">Priority only</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Downtime mode option value, none -->
<string name="zen_mode_downtime_mode_none">None</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Automation category text -->
<string name="zen_mode_automation_category">Automation</string>

10
res/xml/zen_mode_settings.xml
View File

@@ -65,15 +65,25 @@
</PreferenceCategory>
<!-- Downtime -->
<PreferenceCategory
android:key="downtime"
android:title="@string/zen_mode_downtime_category" >
<!-- Days -->
<Preference
android:key="days"
android:title="@string/zen_mode_downtime_days"
android:persistent="false" />
<!-- Start time/End time added and removed here! :-) -->
<!-- Interruptions allowed -->
<com.android.settings.notification.DropDownPreference
android:key="downtime_mode"
android:title="@string/zen_mode_downtime_mode_title"
android:order="100"
android:persistent="false" />
</PreferenceCategory>
<PreferenceCategory