Merge pull request #15 from y3seker/cm-12.1

back button fixed, really

1 files changed, 8 insertions, 9 deletions

diff --git a/keyhandler/src/com/cyanogenmod/settings/device/KeyHandler.java b/keyhandler/src/com/cyanogenmod/settings/device/KeyHandler.java
index 9c7dc05..5b4b8bf 100644
--- a/keyhandler/src/com/cyanogenmod/settings/device/KeyHandler.java
+++ b/keyhandler/src/com/cyanogenmod/settings/device/KeyHandler.java
@@ -112,7 +112,8 @@ public class KeyHandler implements DeviceKeyHandler {
     private boolean mProximityWakeSupported;
     private Instrumentation m_Instrumentation;
     private Context cmaContext = null;
-
+    
+    private boolean isLastPressHomeButton = false;
     private boolean mNotificationSliderVibrate;
 
     public KeyHandler(Context context) {
@@ -230,19 +231,17 @@ public class KeyHandler implements DeviceKeyHandler {
         }
     }
 
-    private boolean isLastPressHomeButton = false;
-
     public boolean handleKeyEvent(KeyEvent event) {
         boolean isHandled = false;
 
         switch (event.getScanCode()) {
             case 102: // Home button event
-                if (event.getDeviceId() == 2 && event.getAction() == KeyEvent.ACTION_DOWN) {
-                    if (isLastPressHomeButton) {
-                        isHandled = true;
-                    }
+                if (event.getKeyCode() == KeyEvent.KEYCODE_BACK
+                        && event.getAction() == KeyEvent.ACTION_DOWN
+                        && isLastPressHomeButton) {
+                    isHandled = true;
                 }
-                isLastPressHomeButton = event.getDeviceId() == 6;
+                isLastPressHomeButton = event.getKeyCode() == KeyEvent.KEYCODE_HOME;
                 break;
             case 195: // Gesture event
                 if (event.getAction() == KeyEvent.ACTION_UP)
@@ -376,4 +375,4 @@ public class KeyHandler implements DeviceKeyHandler {
         File f = new File(MEIZU_GESTURE_DATA);
         return Integer.valueOf(readSingleLine(f));
     }
-}
\ No newline at end of file
+}