You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ma...@apache.org on 2013/05/14 04:24:59 UTC
[1/2] android commit: CB-3068: Android menu not appearing as
actionoverflow
Updated Branches:
refs/heads/master 3917284f7 -> e1f930282
CB-3068: Android menu not appearing as actionoverflow
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/cb07fe39
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/cb07fe39
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/cb07fe39
Branch: refs/heads/master
Commit: cb07fe395cdd48e6994e3c2e72a07496cb376d2d
Parents: a001d8c
Author: Simon MacDonald <si...@gmail.com>
Authored: Mon May 13 22:22:59 2013 -0400
Committer: Simon MacDonald <si...@gmail.com>
Committed: Mon May 13 22:22:59 2013 -0400
----------------------------------------------------------------------
.../src/org/apache/cordova/CordovaWebView.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/cb07fe39/framework/src/org/apache/cordova/CordovaWebView.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index 5dd061e..c57cd50 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -672,8 +672,10 @@ public class CordovaWebView extends WebView {
InputMethodManager imm = (InputMethodManager) cordova.getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(childView.getWindowToken(), 0);
cordova.getActivity().openOptionsMenu();
+ return true;
+ } else {
+ return super.onKeyDown(keyCode, event);
}
- return true;
}
return super.onKeyDown(keyCode, event);
[2/2] android commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cordova-android
Posted by ma...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/e1f93028
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/e1f93028
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/e1f93028
Branch: refs/heads/master
Commit: e1f930282c2dd87d422a5c776fc6f171128f237a
Parents: cb07fe3 3917284
Author: Simon MacDonald <si...@gmail.com>
Authored: Mon May 13 22:23:25 2013 -0400
Committer: Simon MacDonald <si...@gmail.com>
Committed: Mon May 13 22:23:25 2013 -0400
----------------------------------------------------------------------
bin/create | 19 ++-----------------
bin/templates/cordova/version | 32 ++++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 17 deletions(-)
----------------------------------------------------------------------