You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2015/02/19 16:34:53 UTC
[4/5] android commit: Address TODO: Move requestFocusFromTouch() to
CordovaActivity rather than AndroidWebView
Address TODO: Move requestFocusFromTouch() to CordovaActivity rather than AndroidWebView
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/804dcac1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/804dcac1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/804dcac1
Branch: refs/heads/master
Commit: 804dcac12fc76b75bf995f541119d5166d846d79
Parents: fb0987b
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Feb 19 10:32:29 2015 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Feb 19 10:32:29 2015 -0500
----------------------------------------------------------------------
.../src/org/apache/cordova/AndroidWebView.java | 20 --------------------
.../src/org/apache/cordova/CordovaActivity.java | 2 ++
2 files changed, 2 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/804dcac1/framework/src/org/apache/cordova/AndroidWebView.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/AndroidWebView.java b/framework/src/org/apache/cordova/AndroidWebView.java
index a5f568b..60296a9 100755
--- a/framework/src/org/apache/cordova/AndroidWebView.java
+++ b/framework/src/org/apache/cordova/AndroidWebView.java
@@ -163,16 +163,6 @@ public class AndroidWebView extends WebView implements CordovaWebView {
private void initWebViewSettings() {
this.setInitialScale(0);
this.setVerticalScrollBarEnabled(false);
- // TODO: The Activity is the one that should call requestFocus().
- if (shouldRequestFocusOnInit()) {
- this.requestFocusFromTouch();
- }
- this.setInitialScale(0);
- this.setVerticalScrollBarEnabled(false);
- if (shouldRequestFocusOnInit()) {
- this.requestFocusFromTouch();
- }
- // Enable JavaScript
final WebSettings settings = this.getSettings();
settings.setJavaScriptEnabled(true);
settings.setJavaScriptCanOpenWindowsAutomatically(true);
@@ -267,16 +257,6 @@ public class AndroidWebView extends WebView implements CordovaWebView {
}
}
- /**
- * Override this method to decide whether or not you need to request the
- * focus when your application start
- *
- * @return true unless this method is overriden to return a different value
- */
- protected boolean shouldRequestFocusOnInit() {
- return true;
- }
-
private void exposeJsInterface() {
if ((Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1)) {
Log.i(TAG, "Disabled addJavascriptInterface() bridge since Android version is old.");
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/804dcac1/framework/src/org/apache/cordova/CordovaActivity.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaActivity.java b/framework/src/org/apache/cordova/CordovaActivity.java
index 08876ab..9aa5e1f 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -147,6 +147,8 @@ public class CordovaActivity extends Activity {
if ("media".equals(volumePref.toLowerCase(Locale.ENGLISH))) {
setVolumeControlStream(AudioManager.STREAM_MUSIC);
}
+
+ appView.getView().requestFocusFromTouch();
}
@SuppressWarnings("deprecation")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org