Updated Branches: refs/heads/master 0ffffa902 -> e562e4e7b
Removed overrides, fixed CB-1620 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/e562e4e7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/e562e4e7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/e562e4e7 Branch: refs/heads/master Commit: e562e4e7b97de1087d3fc7f3127a730e1127054b Parents: 0ffffa9 Author: Joe Bowser <bows...@apache.org> Authored: Fri Oct 12 14:43:46 2012 -0700 Committer: Joe Bowser <bows...@apache.org> Committed: Fri Oct 12 14:43:46 2012 -0700 ---------------------------------------------------------------------- .../src/org/apache/cordova/AccelListener.java | 1 - .../src/org/apache/cordova/CompassListener.java | 1 - framework/src/org/apache/cordova/DroidGap.java | 21 +++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/e562e4e7/framework/src/org/apache/cordova/AccelListener.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/AccelListener.java b/framework/src/org/apache/cordova/AccelListener.java index 4722967..934a8a8 100755 --- a/framework/src/org/apache/cordova/AccelListener.java +++ b/framework/src/org/apache/cordova/AccelListener.java @@ -156,7 +156,6 @@ public class AccelListener extends CordovaPlugin implements SensorEventListener // Set a timeout callback on the main thread. Handler handler = new Handler(Looper.getMainLooper()); handler.postDelayed(new Runnable() { - @Override public void run() { AccelListener.this.timeout(); } http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/e562e4e7/framework/src/org/apache/cordova/CompassListener.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/CompassListener.java b/framework/src/org/apache/cordova/CompassListener.java index e3a7c59..df62da5 100755 --- a/framework/src/org/apache/cordova/CompassListener.java +++ b/framework/src/org/apache/cordova/CompassListener.java @@ -112,7 +112,6 @@ public class CompassListener extends CordovaPlugin implements SensorEventListene // Set a timeout callback on the main thread. Handler handler = new Handler(Looper.getMainLooper()); handler.postDelayed(new Runnable() { - @Override public void run() { CompassListener.this.timeout(); } http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/e562e4e7/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 f01fea9..95e62c4 100755 --- a/framework/src/org/apache/cordova/DroidGap.java +++ b/framework/src/org/apache/cordova/DroidGap.java @@ -1015,6 +1015,27 @@ public class DroidGap extends Activity implements CordovaInterface { return super.onKeyUp(keyCode, event); } + /* + * Android 2.x needs to be able to check where the cursor is. Android 4.x does not + * + * (non-Javadoc) + * @see android.app.Activity#onKeyDown(int, android.view.KeyEvent) + */ + + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) + { + //Determine if the focus is on the current view or not + if (appView.getHitTestResult() != null && + appView.getHitTestResult().getType() == WebView.HitTestResult.EDIT_TEXT_TYPE && + keyCode == KeyEvent.KEYCODE_BACK) { + return appView.onKeyDown(keyCode, event); + } + else + return super.onKeyDown(keyCode, event); + } + + /** * Called when a message is sent to plugin. *
