Settings preference for choosing long-term conditions.

Requires change Icba2b8b2 in frameworks/base

Change-Id: I9d7a4f668e3b0e721646e42fa080f201c53a7fe9
This commit is contained in:
John Spurlock
2014-05-01 09:09:05 -04:00
parent 312c4573c3
commit 23e221cd93
5 changed files with 239 additions and 19 deletions

View File

@@ -5182,8 +5182,17 @@
<!-- [CHAR LIMIT=40] Zen mode settings: Automatic category text -->
<string name="zen_mode_automatic_category">At night</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Security category text -->
<string name="zen_mode_security_category">Security</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Automation category text -->
<string name="zen_mode_automation_category">Other automation</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Entry conditions option: title -->
<string name="zen_mode_entry_conditions_title">Automatically turn on</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Entry conditions option: summary condition divider -->
<string name="zen_mode_entry_conditions_summary_divider">, </string>
<!-- [CHAR LIMIT=40] Zen mode settings: Entry conditions option: value when blank -->
<string name="zen_mode_entry_conditions_summary_none">Never</string>
<!-- [CHAR LIMIT=20] Zen mode settings: Phone calls option -->
<string name="zen_mode_phone_calls">Phone calls</string>

View File

@@ -49,9 +49,13 @@
android:title="@string/zen_mode_automatic_category" />
<PreferenceCategory
android:key="security"
android:key="automation"
android:layout="@layout/zen_mode_section"
android:title="@string/zen_mode_security_category" >
android:title="@string/zen_mode_automation_category" >
<Preference
android:key="entry"
android:title="@string/zen_mode_entry_conditions_title"
android:persistent="false" />
<Preference
android:key="manage_condition_providers"
android:title="@string/manage_condition_providers"