OSDN Git Service

CMFileManager: Fix back press events
authorRaj Yengisetty <rajesh@cyngn.com>
Wed, 11 Mar 2015 23:01:01 +0000 (16:01 -0700)
committerRaj Yengisetty <rajesh@cyngn.com>
Thu, 12 Mar 2015 00:54:46 +0000 (17:54 -0700)
Use onBackPressed in stead of onKeyUp for back press events

Repro:
- Navigate to audio file
- Open audio file with small player (e.g. Play Music)
- Press back
- Observe: audio player closes and CMFM navigates up one directory

Change-Id: Ia7440c45241ec957b2405b932525235c92b9211c

src/com/cyanogenmod/filemanager/activities/NavigationActivity.java

index 6fb6f19..b4bb0b6 100644 (file)
@@ -1710,16 +1710,18 @@ public class NavigationActivity extends Activity
             }
             return true;
         }
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
-            if (checkBackAction()) {
-                performHideEasyMode();
-                return true;
-            }
+        return super.onKeyUp(keyCode, event);
+    }
 
-            // An exit event has occurred, force the destroy the consoles
-            exit();
+    @Override
+    public void onBackPressed() {
+        if (checkBackAction()) {
+            performHideEasyMode();
+            return;
         }
-        return super.onKeyUp(keyCode, event);
+
+        // An exit event has occurred, force the destroy the consoles
+        exit();
     }
 
     /**