Merge "Lockscreen options : Camera/widgets toggle" into cm-10.1

2 files changed, 88 insertions, 58 deletions

diff --git a/res/xml/device_admin_lockscreen.xml b/res/xml/device_admin_lockscreen.xml
new file mode 100644
index 0000000..fb665d3
--- /dev/null
+++ b/res/xml/device_admin_lockscreen.xml
@@ -0,0 +1,6 @@
+<device-admin xmlns:android="http://schemas.android.com/apk/res/android">
+  <uses-policies>
+    <disable-keyguard-features/>
+    <disable-camera />
+  </uses-policies>
+</device-admin>
diff --git a/res/xml/lockscreen_interface_settings.xml b/res/xml/lockscreen_interface_settings.xml
index 333824f..6bd1373 100644
--- a/res/xml/lockscreen_interface_settings.xml
+++ b/res/xml/lockscreen_interface_settings.xml
@@ -17,63 +17,87 @@
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
     android:title="@string/themes_settings_title" >
 
-     <PreferenceScreen
-         android:key="screen_security"
-         android:fragment="com.android.settings.SecuritySettings"
-         android:title="@string/screen_security_category"
-         android:summary="@string/screen_security_summary">
-         <extra android:name="cm_security" android:value="true" />
-     </PreferenceScreen>
-
-     <ListPreference
-        android:key="lockscreen_background"
-        android:persistent="false"
-        android:dialogTitle="@string/lockscreen_custom_background_title"
-        android:title="@string/lockscreen_custom_background_title"
-        android:entries="@array/lockscreen_background_entries"
-        android:entryValues="@array/lockscreen_background_values" />
-
-     <ListPreference
-        android:key="lockscreen_battery_status"
-        android:persistent="false"
-        android:dialogTitle="@string/lockscreen_battery_status_title"
-        android:title="@string/lockscreen_battery_status_title"
-        android:entries="@array/lockscreen_battery_status_entries"
-        android:entryValues="@array/lockscreen_battery_status_values"
-        android:defaultValue="0" />
-
-    <!-- Lock clock -->
-    <PreferenceScreen
-        android:key="lock_clock"
-        android:title="@string/lock_clock_title"
-        android:summary="@string/lock_clock_summary">
-        <intent android:action="android.intent.action.MAIN"
-                android:targetPackage="com.cyanogenmod.lockclock"
-                android:targetClass="com.cyanogenmod.lockclock.preference.Preferences" />
-    </PreferenceScreen>
-
-    <CheckBoxPreference
-        android:key="lockscreen_maximize_widgets"
-        android:persistent="false"
-        android:title="@string/lockscreen_maximize_widgets_title"
-        android:summary="@string/lockscreen_maximize_widgets_summary" />
-
-    <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
-        android:fragment="com.android.settings.cyanogenmod.LockscreenButtons"
-        android:key="lockscreen_buttons"
-        android:title="@string/lockscreen_buttons_title"
-        android:summary="@string/lockscreen_buttons_summary" />
+    <PreferenceCategory
+        android:title="@string/title_general"
+        android:key="lockscreen_general_category" >
 
+        <PreferenceScreen
+            android:key="screen_security"
+            android:fragment="com.android.settings.SecuritySettings"
+            android:title="@string/screen_security_category"
+            android:summary="@string/screen_security_summary">
+            <extra android:name="cm_security" android:value="true" />
+        </PreferenceScreen>
+
+        <ListPreference
+            android:key="lockscreen_background"
+            android:persistent="false"
+            android:dialogTitle="@string/lockscreen_custom_background_title"
+            android:title="@string/lockscreen_custom_background_title"
+            android:entries="@array/lockscreen_background_entries"
+            android:entryValues="@array/lockscreen_background_values" />
+
+        <ListPreference
+            android:key="lockscreen_battery_status"
+            android:persistent="false"
+            android:dialogTitle="@string/lockscreen_battery_status_title"
+            android:title="@string/lockscreen_battery_status_title"
+            android:entries="@array/lockscreen_battery_status_entries"
+            android:entryValues="@array/lockscreen_battery_status_values"
+            android:defaultValue="0" />
+
+        <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
+            android:fragment="com.android.settings.cyanogenmod.LockscreenButtons"
+            android:key="lockscreen_buttons"
+            android:title="@string/lockscreen_buttons_title"
+            android:summary="@string/lockscreen_buttons_summary" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/lockscreen_widgets_category_title"
+        android:key="lockscreen_widgets_category" >
+
+        <PreferenceScreen
+            android:key="lock_clock"
+            android:summary="@string/lock_clock_summary"
+            android:title="@string/lock_clock_title" >
+
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetClass="com.cyanogenmod.lockclock.preference.Preferences"
+                android:targetPackage="com.cyanogenmod.lockclock" />
+        </PreferenceScreen>
+
+        <CheckBoxPreference
+            android:key="lockscreen_maximize_widgets"
+            android:persistent="false"
+            android:summary="@string/lockscreen_maximize_widgets_summary"
+            android:title="@string/lockscreen_maximize_widgets_title" />
+
+        <CheckBoxPreference
+            android:key="lockscreen_enable_widgets"
+            android:persistent="false"
+            android:title="@string/lockscreen_enable_widgets_title"
+            android:summary="@string/lockscreen_enable_widgets_summary" />
+
+        <CheckBoxPreference
+            android:key="lockscreen_enable_camera"
+            android:persistent="false"
+            android:title="@string/lockscreen_enable_camera_title"
+            android:summary="@string/lockscreen_enable_camera_summary" />
+
+        <CheckBoxPreference
+            android:key="lockscreen_music_controls"
+            android:persistent="false"
+            android:title="@string/lockscreen_music_controls_title"
+            android:summary="@string/lockscreen_music_controls_summary" />
+
+    </PreferenceCategory>
 </PreferenceScreen>