diff options
| author | d34d <clark@cyngn.com> | 2016-06-07 15:35:50 -0700 |
|---|---|---|
| committer | Clark Scheff <clark@cyngn.com> | 2016-06-19 08:35:41 -0700 |
| commit | 5004f924851585be3b2bb149eede87c35f3f28c8 (patch) | |
| tree | 9690f13607502d7a87941ee6817455d2e35747f9 | |
| parent | 693ea85e11209f943bb3989f44cc44db33958c75 (diff) | |
| download | packages_apps_Settings-5004f924851585be3b2bb149eede87c35f3f28c8.zip packages_apps_Settings-5004f924851585be3b2bb149eede87c35f3f28c8.tar.gz packages_apps_Settings-5004f924851585be3b2bb149eede87c35f3f28c8.tar.bz2 | |
Bring back the custom wallpaper picker [3/5]
Change-Id: I546a6ce67627c22cfbc7f6f061c21954183936b7
TICKET: OSS-62
| -rw-r--r-- | res/values/cm_strings.xml | 3 | ||||
| -rw-r--r-- | res/xml/security_settings_chooser.xml | 7 | ||||
| -rw-r--r-- | res/xml/security_settings_password.xml | 7 | ||||
| -rw-r--r-- | res/xml/security_settings_pattern.xml | 7 | ||||
| -rw-r--r-- | res/xml/security_settings_pin.xml | 7 |
5 files changed, 31 insertions, 0 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 386d090..68bd97c 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -1242,4 +1242,7 @@ <string name="cm_radio_info_diag_log_on_label">Turn off Diag log</string> <string name="cm_radio_info_diag_log_off_label">Turn on Diag log</string> + <!-- Lock screen wallpaper --> + <string name="lockscreen_wallpaper_title">Wallpaper</string> + </resources> diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml index 0f8a9bc..d82ad11 100644 --- a/res/xml/security_settings_chooser.xml +++ b/res/xml/security_settings_chooser.xml @@ -61,6 +61,13 @@ android:title="@string/lockscreen_weather_enabled_title" android:defaultValue="false"/> + <PreferenceScreen + android:key="lockscreen_wallpaper" + android:title="@string/lockscreen_wallpaper_title" > + <intent + android:action="android.intent.action.SET_KEYGUARD_WALLPAPER" /> + </PreferenceScreen> + </PreferenceCategory> </PreferenceScreen> diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml index cecb26d..188f986 100644 --- a/res/xml/security_settings_password.xml +++ b/res/xml/security_settings_password.xml @@ -87,6 +87,13 @@ android:title="@string/lockscreen_weather_enabled_title" android:defaultValue="false"/> + <PreferenceScreen + android:key="lockscreen_wallpaper" + android:title="@string/lockscreen_wallpaper_title" > + <intent + android:action="android.intent.action.SET_KEYGUARD_WALLPAPER" /> + </PreferenceScreen> + </PreferenceCategory> </PreferenceScreen> diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml index a4d77d5..44fe95f 100644 --- a/res/xml/security_settings_pattern.xml +++ b/res/xml/security_settings_pattern.xml @@ -103,6 +103,13 @@ android:title="@string/lockscreen_weather_enabled_title" android:defaultValue="false"/> + <PreferenceScreen + android:key="lockscreen_wallpaper" + android:title="@string/lockscreen_wallpaper_title" > + <intent + android:action="android.intent.action.SET_KEYGUARD_WALLPAPER" /> + </PreferenceScreen> + </PreferenceCategory> </PreferenceScreen> diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml index 869c16b..2547079 100644 --- a/res/xml/security_settings_pin.xml +++ b/res/xml/security_settings_pin.xml @@ -92,6 +92,13 @@ android:title="@string/lockscreen_weather_enabled_title" android:defaultValue="false"/> + <PreferenceScreen + android:key="lockscreen_wallpaper" + android:title="@string/lockscreen_wallpaper_title" > + <intent + android:action="android.intent.action.SET_KEYGUARD_WALLPAPER" /> + </PreferenceScreen> + </PreferenceCategory> </PreferenceScreen> |