fix: CAMERA and FOCUS not work in camera app

this close #119
osfans · Jan 22, 2017 · 7b99981 · 7b99981
1 parent 7cc439e
commit 7b99981
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/src/com/osfans/trime/Trime.java b/src/com/osfans/trime/Trime.java
@@ -585,17 +585,30 @@ private boolean handleBack(int keyCode) {
     return false;
   }
 
+  private boolean composeKey(int keyCode) {
+    if (!canCompose) return false;
+    if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
+        keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
+        keyCode == KeyEvent.KEYCODE_VOLUME_MUTE ||
+        keyCode == KeyEvent.KEYCODE_HOME ||
+        keyCode == KeyEvent.KEYCODE_MENU ||
+        keyCode == KeyEvent.KEYCODE_CAMERA ||
+        keyCode == KeyEvent.KEYCODE_FOCUS ||
+        keyCode == KeyEvent.KEYCODE_SEARCH) return false;
+    return true;
+  }
+
   @Override
   public boolean onKeyDown(int keyCode, KeyEvent event) {
     Log.info("onKeyDown="+event);
-    if (canCompose && onKeyEvent(event)) return true;
+    if (composeKey(keyCode) && onKeyEvent(event)) return true;
     return super.onKeyDown(keyCode, event);
   }
 
   @Override
   public boolean onKeyUp(int keyCode, KeyEvent event) {
     Log.info("onKeyUp="+event);
-    if (keyComposing) {
+    if (composeKey(keyCode) && keyComposing) {
       onRelease(keyCode);
       return true;
     }
@@ -610,12 +623,6 @@ private boolean onKeyEvent(KeyEvent event) {
     Log.info("onKeyEvent="+event);
     keyComposing = false;
     int keyCode = event.getKeyCode();
-    if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
-        keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
-        keyCode == KeyEvent.KEYCODE_VOLUME_MUTE ||
-        keyCode == KeyEvent.KEYCODE_HOME ||
-        keyCode == KeyEvent.KEYCODE_MENU ||
-        keyCode == KeyEvent.KEYCODE_SEARCH) return false;
     keyComposing = isComposing();
     if (!keyComposing) {
       if (keyCode == KeyEvent.KEYCODE_DEL ||