summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorLars Greiss <kufikugel@googlemail.com>2014-11-24 23:50:07 +0100
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-06-01 10:58:06 -0700
commit9546c00936b4458b3bf932d62c28b3219ea6a03e (patch)
treed8e361b10cb6270351ab1284c48ed9f58f95ecd7 /res
parentd13fe2ca488fea9627794385b5f563bac55d86ae (diff)
downloadpackages_apps_Settings-9546c00936b4458b3bf932d62c28b3219ea6a03e.zip
packages_apps_Settings-9546c00936b4458b3bf932d62c28b3219ea6a03e.tar.gz
packages_apps_Settings-9546c00936b4458b3bf932d62c28b3219ea6a03e.tar.bz2
Settings: Add per app controls for LP keyguard notifications (2/2)
Nice done by google but the UX is a problem especially for ppl who are using a lot apps and just want to see from important apps the notifications on the lockscreen. This commit adds the ability to - enable/disable per app the keyguard notification at all - enable/disable per app ongoing notifications on the keyguard We handle this over the app policy conf file like the other per app notification options TICKET: CRACKLING-1127 Change-Id: I12df484379621c3baba333d30a8b545b3a0ec0ae
Diffstat (limited to 'res')
-rw-r--r--res/values/cm_strings.xml7
-rw-r--r--res/xml/app_notification_settings.xml18
2 files changed, 24 insertions, 1 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index c02a8f8..4b97f89 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1216,4 +1216,11 @@
<!-- title for lock screen blur preference -->
<string name="lockscreen_blur_enabled_title">Lock screen blur</string>
+
+ <!-- Per app controls for LP keyguard notifications -->
+ <string name="app_notification_show_on_keyguard_title">Show on lockscreen</string>
+ <string name="app_notification_show_on_keyguard_summary">Show notifications from this app on the lockscreen</string>
+ <string name="app_notification_no_ongoing_on_keyguard_title">Disable persistent notification on lockscreen</string>
+ <string name="app_notification_no_ongoing_on_keyguard_summary">Never show persistent notifications from this app on the lockscreen</string>
+
</resources>
diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index b7557b2..f438e2f 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -50,11 +50,27 @@
android:order="4"
android:persistent="false" />
+ <!-- Keyguard options -->
+ <SwitchPreference
+ android:key="show_on_keyguard"
+ android:title="@string/app_notification_show_on_keyguard_title"
+ android:summary="@string/app_notification_show_on_keyguard_summary"
+ android:order="5"
+ android:persistent="false" />
+
+ <SwitchPreference
+ android:key="no_ongoing_on_keyguard"
+ android:title="@string/app_notification_no_ongoing_on_keyguard_title"
+ android:summary="@string/app_notification_no_ongoing_on_keyguard_summary"
+ android:order="6"
+ android:dependency="show_on_keyguard"
+ android:persistent="false" />
+
<!-- App notification preferences -->
<Preference
android:key="app_settings"
android:title="@string/app_notification_preferences"
- android:order="5"
+ android:order="7"
android:persistent="false" />
</PreferenceScreen>