From 5ddf4b6076680bfc5f563d27671deaab0c6e9c1f Mon Sep 17 00:00:00 2001
From: Davide Garberi <dade.garberi@gmail.com>
Date: Sun, 21 Jan 2018 11:13:37 +0100
Subject: msm8996-common: overlay-lineage: Refactor for the new hardware keys
 value

* Squash of the following commits:

commit e3a284ddff6d9b0fbc3cd395a6446d038731290a (HEAD -> lineage-15.1)
Author: Davide Garberi <dade.garberi@gmail.com>
Date:   Sun Jan 21 13:33:39 2018 +0100

    msm8996-comon: Add back the wake property for app_switch_key

    * This isn't actually shown, and removing it makes the buttons app crashing

    Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

commit 6834fc3639a21a317a58d649d885af492a80be26
Author: Davide Garberi <dade.garberi@gmail.com>
Date:   Sun Jan 21 11:24:13 2018 +0100

    msm8996-common: overlay-lineage: Apply custom strings to swipes and long tap

    Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

commit 4349f2359c0d4f4d9538af2dc30cdf7a3225f258
Author: Davide Garberi <dade.garberi@gmail.com>
Date:   Sun Jan 21 11:21:05 2018 +0100

    msm8996-common: overlay-lineage: You can't long press for swipes and longtap

    Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

commit 367c57d8828e6c4b157f1408a7a6ec9880b7565f
Author: Davide Garberi <dade.garberi@gmail.com>
Date:   Sun Jan 21 11:18:51 2018 +0100

    msm8996-common: overlay-lineage: Remove all the wake screen properties but home

    Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

commit 069c368ed4f2a15c0c290899361ce3f5a8c9151c
Author: Davide Garberi <dade.garberi@gmail.com>
Date:   Sun Jan 21 11:17:34 2018 +0100

    msm8996-common: overlay-lineage: Move app_switch_key up

    Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

commit 8d34586f2406b0a09055333a775fdd9f1bf98882
Author: Davide Garberi <dade.garberi@gmail.com>
Date:   Sun Jan 21 11:15:31 2018 +0100

    msm8996-common: overlay-lineage: Remove back button wake the screen function

    Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

commit 3c7e780d34279e6ca398398e90f890dd1870aa6e
Author: Davide Garberi <dade.garberi@gmail.com>
Date:   Sun Jan 21 11:13:37 2018 +0100

    msm8996-common: overlay-lineage: Reset button_settings to Lineage

    Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

* Fixes the right swipe that changes the left swipe function too

Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
---
 .../apps/LineageParts/res/xml/button_settings.xml  | 41 ++++++----------------
 1 file changed, 10 insertions(+), 31 deletions(-)

(limited to 'overlay-lineage')

diff --git a/overlay-lineage/packages/apps/LineageParts/res/xml/button_settings.xml b/overlay-lineage/packages/apps/LineageParts/res/xml/button_settings.xml
index bdc8b21..113b9ff 100644
--- a/overlay-lineage/packages/apps/LineageParts/res/xml/button_settings.xml
+++ b/overlay-lineage/packages/apps/LineageParts/res/xml/button_settings.xml
@@ -136,7 +136,8 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:title="@string/hardware_keys_swipe_left_key_title">
+        android:key="menu_key"
+        android:title="@string/hardware_keys_swipe_right_key_title" >
 
         <ListPreference
             android:key="hardware_keys_menu_press"
@@ -149,11 +150,16 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="menu_key"
-        android:title="@string/hardware_keys_swipe_right_key_title" >
+        android:key="app_switch_key"
+        android:title="@string/hardware_keys_swipe_left_key_title" >
+
+        <lineageos.preference.LineageSystemSettingSwitchPreference
+            android:key="app_switch_wake_screen"
+            android:title="@string/button_wake_title"
+            android:defaultValue="false" />
 
         <ListPreference
-            android:key="hardware_keys_menu_press"
+            android:key="hardware_keys_app_switch_press"
             android:dialogTitle="@string/hardware_keys_swipe_tap_title"
             android:title="@string/hardware_keys_swipe_tap_title"
             android:entries="@array/hardware_keys_action_entries"
@@ -176,33 +182,6 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory
-        android:key="app_switch_key"
-        android:title="@string/hardware_keys_appswitch_key_title" >
-
-        <lineageos.preference.LineageSystemSettingSwitchPreference
-            android:key="app_switch_wake_screen"
-            android:title="@string/button_wake_title"
-            android:defaultValue="false" />
-
-        <ListPreference
-            android:key="hardware_keys_app_switch_press"
-            android:dialogTitle="@string/hardware_keys_short_press_title"
-            android:title="@string/hardware_keys_short_press_title"
-            android:entries="@array/hardware_keys_action_entries"
-            android:entryValues="@array/hardware_keys_action_values"
-            android:persistent="false" />
-
-        <ListPreference
-            android:key="hardware_keys_app_switch_long_press"
-            android:dialogTitle="@string/hardware_keys_long_press_title"
-            android:title="@string/hardware_keys_long_press_title"
-            android:entries="@array/hardware_keys_action_entries"
-            android:entryValues="@array/hardware_keys_action_values"
-            android:persistent="false" />
-
-    </PreferenceCategory>
-
     <PreferenceCategory
         android:key="camera_key"
         android:title="@string/hardware_keys_camera_key_title">
-- 
cgit v1.2.3