summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraActivity.java
diff options
context:
space:
mode:
authorkaiyiz <kaiyiz@codeaurora.org>2014-05-28 14:30:52 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-05-27 23:32:18 -0700
commit70592ddba3e95672d53bcc41f6d17e2d59d9c4a2 (patch)
tree1ea97eba3fd3d48c0247b51b5be3e3159451bbef /src/com/android/camera/CameraActivity.java
parent0542ce1f6f50af1ef45d8623ff3cdc2cc3a92f6b (diff)
downloadandroid_packages_apps_Snap-70592ddba3e95672d53bcc41f6d17e2d59d9c4a2.tar.gz
android_packages_apps_Snap-70592ddba3e95672d53bcc41f6d17e2d59d9c4a2.tar.bz2
android_packages_apps_Snap-70592ddba3e95672d53bcc41f6d17e2d59d9c4a2.zip
Camera2: Make menu not pop up in take picture interface
When we click menu key in view interface and take picture interface,the menu will both pop up. Modify condition to achieve not pop up menu in take picture interface. CRs-fixed: 652961 Change-Id: Ifc2e3b4535fdf48c110673a3ec633ecdc93cc37a
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
-rw-r--r--src/com/android/camera/CameraActivity.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index cd0511536..4f4eb8086 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1321,9 +1321,7 @@ public class CameraActivity extends Activity
// Prevent software keyboard or voice search from showing up.
if (keyCode == KeyEvent.KEYCODE_SEARCH
|| keyCode == KeyEvent.KEYCODE_MENU) {
- if (event.isLongPress()) {
- return true;
- }
+ return true;
}
}