commit 2708da7bf6c955e880f8b7952f53e5917cdfb31e
author Hugo Benichi <hugobenichi@google.com> Tue Jul 11 07:05:26 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 11 07:05:26 2017 +0000
tree 21a09a6d10f712fbcfc387a9ab0a9b2aeebda516
parent ed3e6d47ffa3be00b7dadc4ac82ae5c3d49b0146
parent 7f1396d3f838786f0e49854d284a95c49ac35161

Merge "Fix for the missing focus in WebView form fields."

packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java

diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
index fc01a40..5b3b984 100644
--- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
+++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
@@ -400,6 +400,9 @@
                 return;
             } else if (mPagesLoaded == 2) {
                 // Prevent going back to empty first page.
+                // Fix for missing focus, see b/62449959 for details. Remove it once we get a
+                // newer version of WebView (60.x.y).
+                view.requestFocus();
                 view.clearHistory();
             }
             testForCaptivePortal();