summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/Camera.java
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2011-02-24 19:14:20 +0800
committerWu-cheng Li <wuchengli@google.com>2011-02-25 12:54:07 +0800
commit7673ada94b5e2263e7190ca246694cdee31ed03e (patch)
treea7ddb027e631d884652b1301c2c3264d7cbb9133 /src/com/android/camera/Camera.java
parent8b590562327f6ac95f8e7eac764b05ae43a49299 (diff)
downloadLegacyCamera-7673ada94b5e2263e7190ca246694cdee31ed03e.zip
LegacyCamera-7673ada94b5e2263e7190ca246694cdee31ed03e.tar.gz
LegacyCamera-7673ada94b5e2263e7190ca246694cdee31ed03e.tar.bz2
Ignore search and menu long press key event.
Also ignore menu key during recording. In phone UI, long-pressing search key will launch voice search. Long-pressing menu key will launch software keyboard. It is annoying to accidently launch them while taking a picture. bug:3108635 bug:3278557 Change-Id: I87a5411d08c4bb292b5a0f78a4a0992a59e8816c
Diffstat (limited to 'src/com/android/camera/Camera.java')
-rw-r--r--src/com/android/camera/Camera.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index cb082a0..0723db1 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -92,7 +92,7 @@ import java.util.HashMap;
import java.util.List;
/** The Camera activity which can preview and take pictures. */
-public class Camera extends NoSearchActivity implements View.OnClickListener,
+public class Camera extends ActivityBase implements View.OnClickListener,
ShutterButton.OnShutterButtonListener, SurfaceHolder.Callback,
Switcher.OnSwitchListener {