diff options
| author | David van Tonder <david.vantonder@gmail.com> | 2013-07-02 10:54:38 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-07-02 10:54:38 -0700 |
| commit | 5aacfcbbe55f638d1f69933acb0821492c354b48 (patch) | |
| tree | e5e13dc0d34475d924949e3996f92a89fac9613f /res/xml | |
| parent | 7c2666af7732d33d216b6ca2725896f82b6f3607 (diff) | |
| parent | b59c3557999a9b85f8361641c0cf947580d3aa9c (diff) | |
| download | packages_apps_Settings-5aacfcbbe55f638d1f69933acb0821492c354b48.tar.gz packages_apps_Settings-5aacfcbbe55f638d1f69933acb0821492c354b48.tar.bz2 packages_apps_Settings-5aacfcbbe55f638d1f69933acb0821492c354b48.zip | |
Merge "Add option to hide music controls in lockscreen." into cm-10.1
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/lockscreen_interface_settings.xml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/res/xml/lockscreen_interface_settings.xml b/res/xml/lockscreen_interface_settings.xml index a2d4fa02f..333824f27 100644 --- a/res/xml/lockscreen_interface_settings.xml +++ b/res/xml/lockscreen_interface_settings.xml @@ -52,19 +52,25 @@ android:targetClass="com.cyanogenmod.lockclock.preference.Preferences" /> </PreferenceScreen> - <CheckBoxPreference + <CheckBoxPreference android:key="lockscreen_maximize_widgets" android:persistent="false" android:title="@string/lockscreen_maximize_widgets_title" android:summary="@string/lockscreen_maximize_widgets_summary" /> - <Preference + <CheckBoxPreference + android:key="lockscreen_music_controls" + android:persistent="false" + android:title="@string/lockscreen_music_controls_title" + android:summary="@string/lockscreen_music_controls_summary" /> + + <Preference android:fragment="com.android.settings.cyanogenmod.LockscreenTargets" android:key="lockscreen_targets" android:summary="@string/lockscreen_target_summary" android:title="@string/lockscreen_target_title" /> - <PreferenceScreen + <PreferenceScreen android:fragment="com.android.settings.cyanogenmod.LockscreenButtons" android:key="lockscreen_buttons" android:title="@string/lockscreen_buttons_title" |