diff options
| author | Tony Wickham <twickham@google.com> | 2017-05-16 23:38:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-16 23:38:22 +0000 |
| commit | 9863ea5dc7cbda4888fca4976fb4514bf3ddd7e4 (patch) | |
| tree | f79233973b04f86293eddb1b9141da01921e34a6 /res/xml | |
| parent | 8acf8b506d8c5db2ddcac825a24d0a3bda9fe100 (diff) | |
| parent | d315d07aeef260ef72d57c3e04361c4106d817be (diff) | |
| download | android_packages_apps_Trebuchet-9863ea5dc7cbda4888fca4976fb4514bf3ddd7e4.tar.gz android_packages_apps_Trebuchet-9863ea5dc7cbda4888fca4976fb4514bf3ddd7e4.tar.bz2 android_packages_apps_Trebuchet-9863ea5dc7cbda4888fca4976fb4514bf3ddd7e4.zip | |
Merge "Add setting to turn off icon badging" into ub-launcher3-dorval
am: d315d07aee
Change-Id: Id23914cbee040f3916257e02a9eb6b3f5a821b83
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/launcher_preferences.xml | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml index 301bef104..876388363 100644 --- a/res/xml/launcher_preferences.xml +++ b/res/xml/launcher_preferences.xml @@ -17,13 +17,6 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <SwitchPreference - android:key="pref_allowRotation" - android:title="@string/allow_rotation_title" - android:defaultValue="@bool/allow_rotation" - android:persistent="true" - /> - - <SwitchPreference android:key="pref_add_icon_to_home" android:title="@string/auto_add_shortcuts_label" android:summary="@string/auto_add_shortcuts_description" @@ -40,4 +33,23 @@ android:defaultValue="" android:persistent="false" /> + <Preference + android:key="pref_icon_badging" + android:title="@string/icon_badging_title" + android:persistent="false"> + <intent android:action="android.settings.NOTIFICATION_SETTINGS"> + <!-- This extra highlights the "Allow icon badges" field in Notification settings --> + <extra + android:name=":settings:fragment_args_key" + android:value="notification_badging" /> + </intent> + </Preference>/> + + <SwitchPreference + android:key="pref_allowRotation" + android:title="@string/allow_rotation_title" + android:defaultValue="@bool/allow_rotation" + android:persistent="true" + /> + </PreferenceScreen> |