commit e759994077e66de250dde566d5ff63b49e8c309b
author micky387 <mickaelsaibi@free.fr> Tue Aug 06 06:07:20 2019 +0200
committer micky387 <mickaelsaibi@free.fr> Fri Aug 09 22:16:10 2019 +0200
tree 0287856752b52e5fdf059212b6fe2815e9fb6110
parent e5ae8c7bd0076097de56be946aea05b5f1498407

DeviceParts: Update Offscreen and FP gestures

* Cleanup the code too

DeviceParts/res/values/strings.xml

diff --git a/DeviceParts/res/values/strings.xml b/DeviceParts/res/values/strings.xml
index b8caa3f..f64967c 100644
--- a/DeviceParts/res/values/strings.xml
+++ b/DeviceParts/res/values/strings.xml
@@ -58,6 +58,12 @@
     <string name="choose_app">Choose app</string>
     <string name="category_double_swipe_gesture">II gesture</string>
     <string name="offscreen_gesture_title">Offscreen gestures</string>
+    <string name="category_c_gesture">C gesture</string>
+    <string name="category_e_gesture">E gesture</string>
+    <string name="category_s_gesture">S gesture</string>
+    <string name="category_v_gesture">V gesture</string>
+    <string name="category_w_gesture">W gesture</string>
+    <string name="category_z_gesture">Z gesture</string>
     <string name="category_circle_gesture">O gesture</string>
     <string name="category_down_arrow_gesture">V gesture</string>
     <string name="category_up_arrow_gesture">A gesture</string>

DeviceParts/res/xml/gesture_settings.xml

diff --git a/DeviceParts/res/xml/gesture_settings.xml b/DeviceParts/res/xml/gesture_settings.xml
index c7ef445..aa88399 100644
--- a/DeviceParts/res/xml/gesture_settings.xml
+++ b/DeviceParts/res/xml/gesture_settings.xml
@@ -45,53 +45,53 @@
         android:title="@string/offscreen_gesture_title">
 
         <org.omnirom.device.AppSelectListPreference
-            android:key="circle_gesture_app"
-            android:title="@string/category_circle_gesture"
+            android:key="c_gesture_app"
+            android:title="@string/category_c_gesture"
             android:persistent="false" />
 
         <org.omnirom.device.AppSelectListPreference
-            android:key="double_swipe_gesture_app"
-            android:title="@string/category_double_swipe_gesture"
+            android:key="e_gesture_app"
+            android:title="@string/category_e_gesture"
             android:persistent="false" />
 
         <org.omnirom.device.AppSelectListPreference
-            android:key="left_arrow_gesture_app"
-            android:title="@string/category_left_arrow_gesture"
-            android:persistent="false"/>
-
-        <org.omnirom.device.AppSelectListPreference
-            android:key="right_arrow_gesture_app"
-            android:title="@string/category_right_arrow_gesture"
-            android:persistent="false"/>
-
-        <org.omnirom.device.AppSelectListPreference
-            android:key="up_arrow_gesture_app"
-            android:title="@string/category_up_arrow_gesture"
+            android:key="s_gesture_app"
+            android:title="@string/category_s_gesture"
             android:persistent="false" />
 
         <org.omnirom.device.AppSelectListPreference
-            android:key="down_arrow_gesture_app"
-            android:title="@string/category_down_arrow_gesture"
+            android:key="v_gesture_app"
+            android:title="@string/category_v_gesture"
             android:persistent="false"/>
 
         <org.omnirom.device.AppSelectListPreference
-            android:key="down_swipe_gesture_app"
+            android:key="w_gesture_app"
+            android:title="@string/category_w_gesture"
+            android:persistent="false"/>
+
+        <org.omnirom.device.AppSelectListPreference
+            android:key="z_gesture_app"
+            android:title="@string/category_z_gesture"
+            android:persistent="false"/>
+
+        <org.omnirom.device.AppSelectListPreference
+            android:key="up_gesture_app"
+            android:title="@string/category_up_swipe_gesture"
+            android:persistent="false" />
+
+        <org.omnirom.device.AppSelectListPreference
+            android:key="down_gesture_app"
             android:title="@string/category_down_swipe_gesture"
             android:persistent="false"/>
 
         <org.omnirom.device.AppSelectListPreference
-            android:key="up_swipe_gesture_app"
-            android:title="@string/category_up_swipe_gesture"
+            android:key="left_gesture_app"
+            android:title="@string/category_left_arrow_gesture"
             android:persistent="false"/>
 
         <org.omnirom.device.AppSelectListPreference
-            android:key="left_swipe_gesture_app"
-            android:title="@string/category_left_swipe_gesture"
-            android:persistent="false"/>
-
-        <org.omnirom.device.AppSelectListPreference
-            android:key="right_swipe_gesture_app"
-            android:title="@string/category_right_swipe_gesture"
+            android:key="right_gesture_app"
+            android:title="@string/category_right_arrow_gesture"
             android:persistent="false"/>
 
     </PreferenceCategory>