You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2012/07/27 19:34:15 UTC
android commit: Minor fix to deal with weird keyboard focus issues
and the back button. CB-1146
Updated Branches:
refs/heads/master 401584dbd -> 893ecec55
Minor fix to deal with weird keyboard focus issues and the back button. CB-1146
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/893ecec5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/893ecec5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/893ecec5
Branch: refs/heads/master
Commit: 893ecec55e575a2be50a370f5235bded8ce934b1
Parents: 401584d
Author: Joe Bowser <bo...@apache.org>
Authored: Fri Jul 27 10:33:38 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri Jul 27 10:33:38 2012 -0700
----------------------------------------------------------------------
.../src/org/apache/cordova/CordovaWebView.java | 8 +++++++-
framework/src/org/apache/cordova/DroidGap.java | 15 +++++++++++++++
2 files changed, 22 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/893ecec5/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 234ff65..30b65b3 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -81,6 +81,8 @@ public class CordovaWebView extends WebView {
private boolean volumeupBound;
+ private boolean handleButton = false;
+
/**
* Constructor.
*
@@ -749,7 +751,6 @@ public class CordovaWebView extends WebView {
return super.onKeyUp(keyCode, event);
}
-
Log.d(TAG, "KeyUp has been triggered on the view");
return false;
}
@@ -788,6 +789,7 @@ public class CordovaWebView extends WebView {
public void handlePause(boolean keepRunning)
{
+ LOG.d(TAG, "Handle the pause");
// Send pause event to JavaScript
this.loadUrl("javascript:try{cordova.fireDocumentEvent('pause');}catch(e){console.log('exception firing pause event from native');};");
@@ -843,4 +845,8 @@ public class CordovaWebView extends WebView {
this.pluginManager.onNewIntent(intent);
}
}
+
+ public boolean hadKeyEvent() {
+ return handleButton;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/893ecec5/framework/src/org/apache/cordova/DroidGap.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/DroidGap.java b/framework/src/org/apache/cordova/DroidGap.java
index 4d6df52..a42f16c 100755
--- a/framework/src/org/apache/cordova/DroidGap.java
+++ b/framework/src/org/apache/cordova/DroidGap.java
@@ -1032,5 +1032,20 @@ public class DroidGap extends Activity implements CordovaInterface {
}
return null;
}
+
+ /*
+ * (non-Javadoc)
+ * @see android.app.Activity#onKeyUp(int, android.view.KeyEvent)
+ */
+
+ @Override
+ public boolean onKeyUp(int keyCode, KeyEvent event)
+ {
+ if (appView.backHistory() || keyCode != KeyEvent.KEYCODE_BACK)
+ return appView.onKeyUp(keyCode, event);
+ else
+ return super.onKeyUp(keyCode, event);
+ }
+
}