commit 197a9089341ed62fa81cf957cf74a43de4294cc5
author maxwen <max.weninger@gmail.com> Mon Apr 16 16:40:46 2018 +0200
committer Max Weninger <max.weninger@gmail.com> Wed Apr 18 14:55:53 2018 +0200
tree 9b30698395d71c3af2707391c9428dbecb922ff7
parent 2f1f220a8940f4fc9bee2f905a09f9dcbd113ddf

[2/2] OmniGears: long press on power for flashlight from screen off

Change-Id: I70f699ae6ae2d400145a8cc309b73316a80d9b46

res/xml/button_settings.xml

diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index 839ce99..bdbe49b 100644
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -81,8 +81,14 @@
             android:key="global_actions"
             android:title="@string/global_actions_title"
             android:summary="@string/global_actions_summary"
-            android:icon="@drawable/ic_settings_power"
             android:fragment="org.omnirom.omnigears.interfacesettings.GlobalActionsSettings" />
+
+        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+            android:key="long_press_power_torch"
+            android:title="@string/long_press_power_torch_title"
+            android:summary="@string/long_press_power_torch_summary"
+            android:defaultValue="false" />
+
     </PreferenceCategory>
 
     <PreferenceCategory

res/xml/global_actions.xml

diff --git a/res/xml/global_actions.xml b/res/xml/global_actions.xml
index a317a03..58c89da 100644
--- a/res/xml/global_actions.xml
+++ b/res/xml/global_actions.xml
@@ -20,21 +20,16 @@
         android:key="global_actions"
         android:title="@string/global_actions_title">
 
-    <PreferenceCategory
-        android:key="global_actions_anim"
-        android:title="@string/global_actions_anim" >
+    <org.omnirom.omnigears.preference.SecureSettingSwitchPreference
+        android:key="advanced_reboot"
+        android:title="@string/global_actions_advanced_reboot_title"
+        android:summary="@string/global_actions_advanced_reboot_summary_new"
+        android:defaultValue="false" />
 
-       <org.omnirom.omnigears.preference.SecureSettingSwitchPreference
-            android:key="advanced_reboot"
-            android:title="@string/global_actions_advanced_reboot_title"
-           android:summary="@string/global_actions_advanced_reboot_summary_new"
-            android:defaultValue="false" />
+    <org.omnirom.omnigears.preference.SecureSettingSwitchPreference
+        android:key="lockscreen_power_menu_disabled"
+        android:title="@string/lockscreen_power_menu_disabled_title"
+        android:summary="@string/lockscreen_power_menu_disabled_summary"
+        android:defaultValue="false" />
 
-        <org.omnirom.omnigears.preference.SecureSettingSwitchPreference
-            android:key="lockscreen_power_menu_disabled"
-            android:title="@string/lockscreen_power_menu_disabled_title"
-            android:summary="@string/lockscreen_power_menu_disabled_summary"
-            android:defaultValue="false" />
-
-    </PreferenceCategory>
 </PreferenceScreen>