DeviceParts: Update Offscreen and FP gestures

* Cleanup the code too
diff --git a/keylayout/fts_ts.kl b/keylayout/fts_ts.kl
index 089d86e..0f8d162 100644
--- a/keylayout/fts_ts.kl
+++ b/keylayout/fts_ts.kl
@@ -1,11 +1,15 @@
-key 116    GESTURE_DOUBLE_CLICK          WAKE    VIRTUAL
-key 103    GESTURE_SWIPE_UP          WAKE    VIRTUAL
+#key 116    GESTURE_DOUBLE_CLICK          WAKE    VIRTUAL
+#key 103    GESTURE_SWIPE_UP          WAKE    VIRTUAL
 key 158    BACK               VIRTUAL
-key 139    APP_SWITCH         VIRTUAL
+#key 139    APP_SWITCH         VIRTUAL
 key 102    HOME               VIRTUAL
-key 17     GESTURE_W      WAKE    VIRTUAL
-key 31     GESTURE_S      WAKE    VIRTUAL
-key 18     GESTURE_E      WAKE    VIRTUAL
-key 46     GESTURE_C      WAKE    VIRTUAL
-key 44     GESTURE_Z      WAKE    VIRTUAL
-key 47     GESTURE_V      WAKE    VIRTUAL
+key 258     GESTURE_UP_SWIPE          WAKE    VIRTUAL
+key 259     GESTURE_DOWN_SWIPE        WAKE    VIRTUAL
+key 260     GESTURE_LEFT_SWIPE        WAKE    VIRTUAL
+key 261     GESTURE_RIGHT_SWIPE       WAKE    VIRTUAL
+key 266     GESTURE_W      WAKE    VIRTUAL
+key 267     GESTURE_S      WAKE    VIRTUAL
+key 263     GESTURE_E      WAKE    VIRTUAL
+key 269     GESTURE_C      WAKE    VIRTUAL
+key 270     GESTURE_Z      WAKE    VIRTUAL
+key 268     GESTURE_V      WAKE    VIRTUAL
\ No newline at end of file
diff --git a/keylayout/goodixfp.kl b/keylayout/goodixfp.kl
index 3ec1325..b06d453 100644
--- a/keylayout/goodixfp.kl
+++ b/keylayout/goodixfp.kl
@@ -1,10 +1,4 @@
-key 102   HOME                      VIRTUAL
-key 103   SYSTEM_NAVIGATION_UP      GESTURE
-key 105   SYSTEM_NAVIGATION_LEFT    GESTURE
-key 106   SYSTEM_NAVIGATION_RIGHT   GESTURE
-key 108   SYSTEM_NAVIGATION_DOWN    GESTURE
-
-key 187   FINGERPRINT_TAP           GESTURE
-key 188   FINGERPRINT_DTAP          GESTURE
-key 189   FINGERPRINT_LONGPRESS     GESTURE
-key 192   FINGERPRINT_EARLYWAKEUP   GESTURE
+key 103   SYSTEM_NAVIGATION_UP
+key 108   SYSTEM_NAVIGATION_DOWN
+key 105   SYSTEM_NAVIGATION_LEFT
+key 106   SYSTEM_NAVIGATION_RIGHT
\ No newline at end of file