summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-09-30 19:44:05 -0400
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-09-30 19:44:05 -0400
commitb7c32e2f8ef5b9e2a77c2b942be0df0852090f22 (patch)
tree917404c43770d4a55fbfa5a1bc0d3de9d95b118f /src/com
parent701507459e0d49421bd4a493f2df4511ab4b6841 (diff)
parentd39b16c6c7e92ea3a19e25642447df750aa8def0 (diff)
downloadLegacyCamera-b7c32e2f8ef5b9e2a77c2b942be0df0852090f22.zip
LegacyCamera-b7c32e2f8ef5b9e2a77c2b942be0df0852090f22.tar.gz
LegacyCamera-b7c32e2f8ef5b9e2a77c2b942be0df0852090f22.tar.bz2
Merge change Id43bcf2f into eclair
* changes: Hide the settings when user presses the camera button.
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/camera/OnScreenSettings.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/OnScreenSettings.java b/src/com/android/camera/OnScreenSettings.java
index b1f1a10..40518a7 100644
--- a/src/com/android/camera/OnScreenSettings.java
+++ b/src/com/android/camera/OnScreenSettings.java
@@ -194,6 +194,8 @@ public class OnScreenSettings {
private boolean onContainerKey(KeyEvent event) {
switch (event.getKeyCode()) {
+ case KeyEvent.KEYCODE_CAMERA:
+ case KeyEvent.KEYCODE_FOCUS:
case KeyEvent.KEYCODE_BACK:
case KeyEvent.KEYCODE_MENU:
if (event.getAction() == KeyEvent.ACTION_UP) {