remove FPC gestures

6 files changed, 22 insertions, 65 deletions

diff --git a/cmactions/res/values-ru/strings.xml b/cmactions/res/values-ru/strings.xml
index 9953f84..ab00f5b 100644
--- a/cmactions/res/values-ru/strings.xml
+++ b/cmactions/res/values-ru/strings.xml
@@ -42,11 +42,6 @@
     <string name="touchscreen_ydown_gesture_title">Фонарик</string>
     <string name="touchscreen_ydown_gesture_summary">Нарисуйте вертикальную черту для активации фонарика</string>
 
-    <string name="fpc_gesture_title">Жесты кнопки сенсора</string>
-    <string name="fpc_gesture_tap_summary">Одиночный тап для возврата</string>
-    <string name="fpc_gesture_left_summary">Свайп влево для вызова меню</string>
-    <string name="fpc_gesture_right_summary">Свайп вправо для вызова недавних приложений</string>
-
     <!-- haptic feedback  -->
     <string name="touchscreen_extras">Дополнительные настройки</string>
     <string name="haptic_feedback">Вибрация</string>
diff --git a/cmactions/res/values/strings.xml b/cmactions/res/values/strings.xml
index 6ae6c87..45e229e 100644
--- a/cmactions/res/values/strings.xml
+++ b/cmactions/res/values/strings.xml
@@ -42,11 +42,6 @@
     <string name="touchscreen_ydown_gesture_title">Flashlight</string>
     <string name="touchscreen_ydown_gesture_summary">Draw a vertical line down to activate Flashlight</string>
 
-    <string name="fpc_gesture_title">Fingerprint Sensor Gestures</string>
-    <string name="fpc_gesture_tap_summary">Tap once to Back</string>
-    <string name="fpc_gesture_left_summary">Swipe left for Menu</string>
-    <string name="fpc_gesture_right_summary">Swipe right for Recent Apps</string>
-
     <!-- haptic feedback  -->
     <string name="touchscreen_extras">Extras</string>
     <string name="haptic_feedback">Haptic feedback</string>
diff --git a/cmactions/res/xml/touchscreen_panel.xml b/cmactions/res/xml/touchscreen_panel.xml
index edf8453..c5326b1 100644
--- a/cmactions/res/xml/touchscreen_panel.xml
+++ b/cmactions/res/xml/touchscreen_panel.xml
@@ -17,20 +17,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceCategory
-        android:key="fpc_gestures"
-        android:title="@string/fpc_gesture_title" >
-
-    <SwitchPreference
-            android:key="fpc_gesture_left"
-            android:title="@string/fpc_gesture_left_summary" />
-
-    <SwitchPreference
-            android:key="fpc_gesture_right"
-            android:title="@string/fpc_gesture_right_summary" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
         android:title="@string/touchscreen_control_gesture_head" >
 
     <SwitchPreference
diff --git a/cmactions/src/com/cyanogenmod/settings/device/CMActionsSettings.java b/cmactions/src/com/cyanogenmod/settings/device/CMActionsSettings.java
index 24bdb77..dcff1ea 100644
--- a/cmactions/src/com/cyanogenmod/settings/device/CMActionsSettings.java
+++ b/cmactions/src/com/cyanogenmod/settings/device/CMActionsSettings.java
@@ -43,11 +43,6 @@ public class CMActionsSettings {
     public static final String TOUCHSCREEN_W_GESTURE_KEY = "touchscreen_gesture_w";
     public static final String TOUCHSCREEN_M_GESTURE_KEY = "touchscreen_gesture_m";
     public static final String TOUCHSCREEN_YDOWN_GESTURE_KEY = "touchscreen_gesture_ydown";
-
-    public static final String FPC_GESTURE_TAP_KEY = "fpc_gesture_tap";
-    public static final String FPC_GESTURE_LEFT_GESTURE_KEY = "fpc_gesture_left";
-    public static final String FPC_GESTURE_RIGHT_KEY = "fpc_gesture_right";
-
     public static final String TOUCHSCREEN_GESTURE_HAPTIC_FEEDBACK =
             "touchscreen_gesture_haptic_feedback";
 
diff --git a/cmhw/org/cyanogenmod/hardware/KeyDisabler.java b/cmhw/org/cyanogenmod/hardware/KeyDisabler.java
index 038e1a5..b101869 100644
--- a/cmhw/org/cyanogenmod/hardware/KeyDisabler.java
+++ b/cmhw/org/cyanogenmod/hardware/KeyDisabler.java
@@ -16,10 +16,7 @@
 
 package org.cyanogenmod.hardware;
 
-import java.io.File;
-
-import org.cyanogenmod.hardware.util.FileUtils;
-
+import android.util.Log;
 /*
  * Disable capacitive keys
  *
@@ -31,17 +28,31 @@ import org.cyanogenmod.hardware.util.FileUtils;
 
 public class KeyDisabler {
 
-    private static String CONTROL_PATH = "/proc/nav_switch";
+    private static boolean isActive = false;
+    /*
+     * All HAF classes should export this boolean.
+     * Real implementations must, of course, return true
+     */
 
-    public static boolean isSupported() {
-        return new File(CONTROL_PATH).exists();
-    }
+    public static boolean isSupported() { return true; }
+
+    /*
+     * Are the keys currently blocked?
+     */
 
     public static boolean isActive() {
-        return (FileUtils.readOneLine(CONTROL_PATH).contains(":0"));
+        return isActive;
     }
 
+    /*
+     * Disable capacitive keys
+     */
+
     public static boolean setActive(boolean state) {
-        return FileUtils.writeLine(CONTROL_PATH, (state ? "0" : "2"));
+        //throw new UnsupportedOperationException();
+        isActive = state;
+        Log.i("KeyDisabler", "setActive " + state);
+        return isActive;
     }
+
 }
diff --git a/keyhandler/src/com/cyanogenmod/settings/device/KeyHandler.java b/keyhandler/src/com/cyanogenmod/settings/device/KeyHandler.java
index f7a0af2..926a5bf 100644
--- a/keyhandler/src/com/cyanogenmod/settings/device/KeyHandler.java
+++ b/keyhandler/src/com/cyanogenmod/settings/device/KeyHandler.java
@@ -60,12 +60,6 @@ public class KeyHandler implements DeviceKeyHandler {
 
     private static final String KEY_GESTURE_HAPTIC_FEEDBACK =
             "touchscreen_gesture_haptic_feedback";
-    private static final String KEY_FPC_TAP =
-            "fpc_gesture_tap";
-    private static final String KEY_FPC_LEFT =
-            "fpc_gesture_left";
-    private static final String KEY_FPC_RIGHT =
-            "fpc_gesture_right";
 
     private static final String TOUCHSCREEN_GESTURE_HAPTIC_FEEDBACK =
             "touchscreen_gesture_haptic_feedback";
@@ -84,10 +78,6 @@ public class KeyHandler implements DeviceKeyHandler {
     private static final int MODE_DO_NOT_DISTURB = 616; //S
     private static final int MODE_NORMAL = 194; //W
 
-    private static final int GESTURE_FPC_TAP_SCANCODE = 102;
-    private static final int GESTURE_FPC_LEFT_SCANCODE = 191;
-    private static final int GESTURE_FPC_RIGHT_SCANCODE = 190;
-
     private static final int GESTURE_WAKELOCK_DURATION = 3000;
 
     private static final int[] sSupportedGestures = new int[] {
@@ -99,10 +89,7 @@ public class KeyHandler implements DeviceKeyHandler {
         GESTURE_GTR_SCANCODE,
         MODE_MUTE,
         MODE_DO_NOT_DISTURB,
-        MODE_NORMAL,
-        GESTURE_FPC_TAP_SCANCODE,
-        GESTURE_FPC_LEFT_SCANCODE,
-        GESTURE_FPC_RIGHT_SCANCODE
+        MODE_NORMAL
     };
 
     private final Context mContext;
@@ -191,18 +178,6 @@ public class KeyHandler implements DeviceKeyHandler {
                 startActivitySafely(intent);
                 doHapticFeedback();
                 break;
-            case GESTURE_FPC_LEFT_SCANCODE:
-                if(getCMApref(KEY_FPC_LEFT, false)) {
-                    m_Instrumentation.sendKeyDownUpSync( KeyEvent.KEYCODE_MENU );
-                    doHapticFeedback();
-                }
-                break;
-            case GESTURE_FPC_RIGHT_SCANCODE:
-                if(getCMApref(KEY_FPC_RIGHT, false)) {
-                    m_Instrumentation.sendKeyDownUpSync( KeyEvent.KEYCODE_APP_SWITCH );
-                    doHapticFeedback();
-                }
-                break;
             case GESTURE_Z_SCANCODE:
                 dispatchMediaKeyWithWakeLockToMediaSession(KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE);
                 doHapticFeedback();