commit b24d71b85e17d6fbe095a496dad5cbe077be59bf
author maxwen <max.weninger@gmail.com> Tue Feb 21 01:18:28 2017 +0100
committer Max Weninger <max.weninger@gmail.com> Wed Feb 22 18:10:04 2017 +0100
tree 47cc66d386a96b37a8a67050c88d9b8cee393b1f
parent c7589a21810d240cc4359515b636ca1a1e00977c

[2/2] OmniGears: readd lock screen shortcut config

define if left shortcut is dialer or voice
hide left right or both
hide indicator text

Change-Id: Iaceb32429d2f243f24684c5b694dd96ed88d279c

res/values/custom_strings.xml

diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index 2891544..3d0c992 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -211,12 +211,6 @@
 
     <string name="doze_brightness_level_title">Brightness level</string>
 
-    <!-- Lock screen wallpaper -->
-    <string name="lockscreen_wallpaper_title">Wallpaper</string>
-    <string name="lockscreen_wallpaper_set_title">Set lock screen wallpaper</string>
-    <string name="lockscreen_wallpaper_clear_title">Clear lock screen wallpaper</string>
-    <string name="reset_lockscreen_wallpaper">Set to default</string>
-
     <!-- Lock screen config -->
     <string name="lockscreen_shortcut_title">Shortcuts</string>
     <string name="lockscreen_voice_shortcut_title">Voice assist shortcut</string>
@@ -237,7 +231,7 @@
     <string name="lockscreen_shortcut_apps_title">Shortcuts</string>
     <string name="lockscreen_shortcut_add">Add\u2026</string>
     <string name="lockscreen_indicator_display_title">Show bottom status text</string>
-    <string name="lockscreen_indicator_display_summary">Note: custom shortcuts will hide text</string>
+    <string name="lockscreen_indicator_display_summary"></string>
     <string name="lockscreen_camera_shortcut_enable_title">Show camera shortcut</string>
     <string name="lockscreen_camera_shortcut_enable_summary">Visibility depends on system setup</string>
     <string name="lockscreen_left_shortcut_enable_title">Show dialer or voice assist shortcut</string>

res/xml/lockscreen_settings.xml

diff --git a/res/xml/lockscreen_settings.xml b/res/xml/lockscreen_settings.xml
index 1f85eba..f6555b8 100644
--- a/res/xml/lockscreen_settings.xml
+++ b/res/xml/lockscreen_settings.xml
@@ -16,36 +16,36 @@
  -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-<!--
     <PreferenceCategory
         android:key="lockscreen_shortcut"
         android:title="@string/lockscreen_shortcut_title" >
 
-        <com.android.settings.preference.SecureSettingSwitchPreference
+        <org.omnirom.omnigears.preference.SecureSettingSwitchPreference
             android:key="lockscreen_shortcuts_enable"
             android:title="@string/lockscreen_shortcuts_enable_title"
             android:defaultValue="true"/>
 
-        <com.android.settings.preference.SecureCheckBoxPreference
+        <org.omnirom.omnigears.preference.SecureCheckBoxPreference
             android:key="lockscreen_camera_shortcut_enable"
             android:title="@string/lockscreen_camera_shortcut_enable_title"
             android:summary="@string/lockscreen_camera_shortcut_enable_summary"
             android:defaultValue="true"
             android:dependency="lockscreen_shortcuts_enable" />
 
-        <com.android.settings.preference.SecureCheckBoxPreference
+        <org.omnirom.omnigears.preference.SecureCheckBoxPreference
             android:key="lockscreen_left_shortcut_enable"
             android:title="@string/lockscreen_left_shortcut_enable_title"
             android:summary="@string/lockscreen_left_shortcut_enable_summary"
             android:defaultValue="true"
             android:dependency="lockscreen_shortcuts_enable" />
 
-        <com.android.settings.preference.SecureCheckBoxPreference
+        <org.omnirom.omnigears.preference.SecureCheckBoxPreference
             android:key="lockscreen_voice_shortcut"
             android:title="@string/lockscreen_voice_shortcut_title"
             android:summary="@string/lockscreen_voice_shortcut_summary"
             android:defaultValue="true"
             android:dependency="lockscreen_left_shortcut_enable" />
+        <!--
 
         <Preference
             android:key="lockscreen_shortcuts"
@@ -53,18 +53,19 @@
             android:summary="@string/lockscreen_shortcuts_summary"
             android:persistent="false"
             android:dependency="lockscreen_shortcuts_enable" />
+        -->
+
     </PreferenceCategory>
--->
     <PreferenceCategory
         android:key="lockscreen_other"
         android:title="@string/other_category" >
-<!--
-        <com.android.settings.preference.SystemSettingSwitchPreference
+
+        <org.omnirom.omnigears.preference.SecureSettingSwitchPreference
             android:key="lockscreen_indicator_display"
             android:title="@string/lockscreen_indicator_display_title"
             android:summary="@string/lockscreen_indicator_display_summary"
             android:defaultValue="true" />
--->
+
         <org.omnirom.omnigears.preference.SecureSettingSwitchPreference
             android:key="lockscreen_qs_disabled"
             android:title="@string/lockscreen_qs_disabled_title"
@@ -77,21 +78,6 @@
 
     </PreferenceCategory>
 <!--
-    <PreferenceCategory
-        android:key="lockscreen_wallpaper"
-        android:title="@string/lockscreen_wallpaper_title" >
-
-        <Preference
-            android:key="lockscreen_wallpaper_set"
-            android:title="@string/lockscreen_wallpaper_set_title"
-            android:persistent="false"/>
-
-        <Preference
-            android:key="lockscreen_wallpaper_clear"
-            android:title="@string/lockscreen_wallpaper_clear_title"
-            android:persistent="false"/>
-
-    </PreferenceCategory>
 
     <PreferenceCategory
         android:key="lockscreen_clock"