[2/2] OmniGears: long press on power for flashlight from screen off
Change-Id: I70f699ae6ae2d400145a8cc309b73316a80d9b46
diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index 69233e5..8215552 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -362,7 +362,6 @@
<string name="global_actions_dnd_title">Do not disturb</string>
<string name="global_actions_summary">Actions shown in power menu</string>
<string name="global_actions_header">Some actions are only visible depending on the setup or only if the device is unlocked</string>
- <string name="global_actions_anim">Appearance</string>
<string name="global_actions_advanced_reboot_summary">Show more options in restart menu</string>
<string name="global_actions_advanced_reboot_title">Enable advanced restart</string>
<string name="global_actions_advanced_reboot_summary_new">Show more options in restart menu if not locked</string>
@@ -386,13 +385,7 @@
<string name="status_bar_quick_qs_pulldown_off">Off</string>
<string name="status_bar_quick_qs_pulldown_left">Left</string>
<string name="status_bar_quick_qs_pulldown_right">Right</string>
- <!-- Power menu Animations -->
- <string name="power_menu_animation_title">Power menu animation</string>
- <string name="power_menu_animation_summary">Change the enter/exit animation of the power menu</string>
- <string name="power_menu_animation_dialog_title">Select power menu animation</string>
- <string name="power_menu_animation_enter">Omni (default)</string>
- <string name="power_menu_animation_bottom">Bottom</string>
- <string name="power_menu_animation_top">Top</string>
+
<!-- Notification light dialogs -->
<string name="edit_light_settings">Edit light settings</string>
<string name="pulse_speed_title">Pulse length and speed</string>
@@ -749,4 +742,7 @@
<!-- Bottom shortcuts -->
<string name="systemui_tuner_lockscreen_bottom_shortcuts_title">Bottom shortcuts</string>
<string name="systemui_tuner_lockscreen_bottom_shortcuts_summary">Configure the bottom shortcuts</string>
+
+ <string name="long_press_power_torch_title">Long press for flashlight</string>
+ <string name="long_press_power_torch_summary">Toggle flashlight when screen is off</string>
</resources>
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
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>