diff options
author | Doris Liu <tianliu@google.com> | 2013-10-04 00:08:20 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-04 00:08:20 +0000 |
commit | b0fbd5437cc67ce10e8f4b2a7318d4cc97110976 (patch) | |
tree | 87260a8c453630ec06a076f3cb0eb4bebdf7109c /src | |
parent | 7ba4a88eb78fc41717275de25748f5cf17915f5b (diff) | |
parent | dba16ae7d0aee0c3984df68b5787a0d0a7cd6f50 (diff) | |
download | android_packages_apps_Snap-b0fbd5437cc67ce10e8f4b2a7318d4cc97110976.tar.gz android_packages_apps_Snap-b0fbd5437cc67ce10e8f4b2a7318d4cc97110976.tar.bz2 android_packages_apps_Snap-b0fbd5437cc67ce10e8f4b2a7318d4cc97110976.zip |
Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index c38b13031..18c8a9ab8 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1141,15 +1141,17 @@ public class CameraActivity extends Activity @Override public boolean onKeyDown(int keyCode, KeyEvent event) { - if (mCurrentModule.onKeyDown(keyCode, event)) { - return true; - } - // Prevent software keyboard or voice search from showing up. - if (keyCode == KeyEvent.KEYCODE_SEARCH - || keyCode == KeyEvent.KEYCODE_MENU) { - if (event.isLongPress()) { + if (mFilmStripView.inCameraFullscreen()) { + if (mCurrentModule.onKeyDown(keyCode, event)) { return true; } + // Prevent software keyboard or voice search from showing up. + if (keyCode == KeyEvent.KEYCODE_SEARCH + || keyCode == KeyEvent.KEYCODE_MENU) { + if (event.isLongPress()) { + return true; + } + } } return super.onKeyDown(keyCode, event); @@ -1157,7 +1159,7 @@ public class CameraActivity extends Activity @Override public boolean onKeyUp(int keyCode, KeyEvent event) { - if (mCurrentModule.onKeyUp(keyCode, event)) { + if (mFilmStripView.inCameraFullscreen() && mCurrentModule.onKeyUp(keyCode, event)) { return true; } return super.onKeyUp(keyCode, event); |