From a0e7ac5f1eae637aa0fd23a0d2ce3cd90d42d73a Mon Sep 17 00:00:00 2001 From: Raj Yengisetty Date: Wed, 11 Mar 2015 16:01:01 -0700 Subject: [PATCH] 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 --- .../filemanager/activities/NavigationActivity.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java index 6fb6f19..b4bb0b6 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(); } /** -- 2.11.0