aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxiao.hu <huxiao0816@gmail.com>2015-03-17 06:12:46 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-03-19 09:25:35 +0000
commit336c3849084b0a3f35500215d9ad4d94fcb63d89 (patch)
treeb5a4ec7578f7c565d4b7d6f32f104b5ac47c960c
parent05ddc9cd818b41b8673b848b2a48982f48738277 (diff)
downloadandroid_packages_apps_CMFileManager-336c3849084b0a3f35500215d9ad4d94fcb63d89.tar.gz
android_packages_apps_CMFileManager-336c3849084b0a3f35500215d9ad4d94fcb63d89.tar.bz2
android_packages_apps_CMFileManager-336c3849084b0a3f35500215d9ad4d94fcb63d89.zip
CMFileManager: Fix back press events of SearchActivity
epro: - SearchActivity to audio file - Open audio file with small player (e.g. Play Music) - Press back - Observe: audio player closes and CMFM SearchActivity up one directory(NavigationActivity) Change-Id: I4ab1faa1d061eea97050b89e96c1bdf1df66db3f
-rw-r--r--src/com/cyanogenmod/filemanager/activities/SearchActivity.java17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/com/cyanogenmod/filemanager/activities/SearchActivity.java b/src/com/cyanogenmod/filemanager/activities/SearchActivity.java
index c7772361..615e6cee 100644
--- a/src/com/cyanogenmod/filemanager/activities/SearchActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/SearchActivity.java
@@ -971,18 +971,11 @@ public class SearchActivity extends Activity
* {@inheritDoc}
*/
@Override
- public boolean onKeyUp(int keyCode, KeyEvent event) {
- switch (keyCode) {
- case KeyEvent.KEYCODE_BACK:
- // release Console lock held by the async search task
- if (mExecutable != null) {
- mExecutable.end();
- }
- back(true, null, false);
- return true;
- default:
- return super.onKeyUp(keyCode, event);
- }
+ public void onBackPressed() {
+ if (mExecutable != null) {
+ mExecutable.end();
+ }
+ back(true, null, false);
}
/**