aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaj Yengisetty <rajesh@cyngn.com>2015-03-11 16:01:01 -0700
committerRaj Yengisetty <rajesh@cyngn.com>2015-03-11 17:54:46 -0700
commita0e7ac5f1eae637aa0fd23a0d2ce3cd90d42d73a (patch)
treec23fe8f1a7870ad6dfd89fdd29f19a5bf6fa4add
parent89b3b11261a441379c0f57d924e1cac32b5c3318 (diff)
downloadandroid_packages_apps_CMFileManager-a0e7ac5f1eae637aa0fd23a0d2ce3cd90d42d73a.tar.gz
android_packages_apps_CMFileManager-a0e7ac5f1eae637aa0fd23a0d2ce3cd90d42d73a.tar.bz2
android_packages_apps_CMFileManager-a0e7ac5f1eae637aa0fd23a0d2ce3cd90d42d73a.zip
CMFileManager: Fix back press events
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
-rw-r--r--src/com/cyanogenmod/filemanager/activities/NavigationActivity.java18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
index 6fb6f198..b4bb0b65 100644
--- a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
@@ -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();
}
/**