diff options
| author | Chris Wren <cwren@android.com> | 2014-03-01 00:06:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-01 00:06:55 +0000 |
| commit | f7890677dfa2a420f0752055c25cca18cb42b1b5 (patch) | |
| tree | b05cd06e2025214ab320058025631394d8aaa782 /res | |
| parent | 5ae9ef25c6ffdd17116616834d8583df9a9409c2 (diff) | |
| parent | ad1b7eb3986809f57d9485e40d336b28035de3e8 (diff) | |
| download | packages_apps_Settings-f7890677dfa2a420f0752055c25cca18cb42b1b5.tar.gz packages_apps_Settings-f7890677dfa2a420f0752055c25cca18cb42b1b5.tar.bz2 packages_apps_Settings-f7890677dfa2a420f0752055c25cca18cb42b1b5.zip | |
Merge "add a setting for the heads up: app part"
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | res/xml/display_settings.xml | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 56f7ddf7e..8b6e6713c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1753,6 +1753,10 @@ <string name="notification_sound_title">Default notification sound</string> <!-- Sound settings screen, notification light repeat pulsing title --> <string name="notification_pulse_title">Pulse notification light</string> + <!-- Display settings screen, notification popups are enabled [CHAR LIMIT=30] --> + <string name="heads_up_enabled_title">Heads Up Notifications</string> + <!-- Display settings screen, notification popups are explained [CHAR LIMIT=45]--> + <string name="heads_up_enabled_summary">Important notifications will pop up</string> <!-- Sound settings screen, the title of the volume bar to adjust the incoming call volume --> <string name="incoming_call_volume_title">Ringtone</string> <!-- Sound settings screen, the title of the volume bar to adjust the notification volume --> diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index a9506e873..53d9915ce 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -53,6 +53,12 @@ android:title="@string/notification_pulse_title" android:persistent="false" /> + <CheckBoxPreference + android:key="heads_up" + android:title="@string/heads_up_enabled_title" + android:summary="@string/heads_up_enabled_summary" + android:persistent="false" /> + <PreferenceScreen android:key="wifi_display" android:title="@string/wifi_display_settings_title" |