diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-06-05 16:37:36 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-06-05 16:37:36 -0700 |
| commit | ae531060071669eb4fcb10f04420f941bc04115c (patch) | |
| tree | 25c4e2b75c396a6db2750e8252a8f5a3489b9e53 /src | |
| parent | 388b3690fad4a847bad20a623138a66f4255b02d (diff) | |
| parent | 70592ddba3e95672d53bcc41f6d17e2d59d9c4a2 (diff) | |
| download | android_packages_apps_Snap-ae531060071669eb4fcb10f04420f941bc04115c.tar.gz android_packages_apps_Snap-ae531060071669eb4fcb10f04420f941bc04115c.tar.bz2 android_packages_apps_Snap-ae531060071669eb4fcb10f04420f941bc04115c.zip | |
Merge "Camera2: Make menu not pop up in take picture interface"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 5b8cf06d4..168c9064a 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1329,9 +1329,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; } } |