summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaiyiz <kaiyiz@codeaurora.org>2014-05-28 14:30:52 +0800
committerEthan Chen <intervigil@gmail.com>2014-10-28 21:47:52 +0000
commit4fff272e958b014037f06cb362fe79ba2c63dfcb (patch)
treefde9dae566ebb3a3b358e8acbb7cf964a88c1eb3
parentb9c718ed77e14ad5667686284243e5de12062080 (diff)
downloadandroid_packages_apps_Camera2-4fff272e958b014037f06cb362fe79ba2c63dfcb.tar.gz
android_packages_apps_Camera2-4fff272e958b014037f06cb362fe79ba2c63dfcb.tar.bz2
android_packages_apps_Camera2-4fff272e958b014037f06cb362fe79ba2c63dfcb.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
-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 f0daab825..6fb0ec836 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1330,9 +1330,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;
}
}