Merge pull request #167 from wuhengzhi/master

Fix the Cordova app exit issue.

Author: huningxin

framework/src/org/apache/cordova/CordovaActivity.java

@@ -1115,8 +1115,13 @@ public boolean onKeyUp(int keyCode, KeyEvent event)
     public boolean onKeyDown(int keyCode, KeyEvent event)
     {
         //Determine if the focus is on the current view or not
-        if (appView != null && appView.getFocusedChild() != null && (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_MENU)) {
-                    return appView.onKeyDown(keyCode, event);
+        if (appView != null && appView.getFocusedChild() != null &&
+                (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_MENU)) {
+            if (!appView.onKeyDown(keyCode, event)) {
+                getActivity().finish();
+                return false;
+            }
+            return true;
         }
         else
             return super.onKeyDown(keyCode, event);

framework/src/org/apache/cordova/CordovaWebView.java

@@ -675,13 +675,6 @@ public boolean dispatchKeyEvent(KeyEvent event)
                         return true;
                     }
                     // If not, then invoke default behavior
-                    else {
-                        //this.activityState = ACTIVITY_EXITING;
-                        //return false;
-                        // If they hit back button when app is initializing, app should exit instead of hang until initialization (CB2-458)
-                        this.cordova.getActivity().finish();
-                        return false;
-                    }
                 }
             }
         }