commit f0223b1fa8dcb7f9d779ae95229490cba6ab98f3
author Hugo Benichi <hugobenichi@google.com> Mon May 15 04:35:41 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 15 04:35:48 2017 +0000
tree 03c8b4d0578e2c1183cfdc46fb48b88e6f9c2a3d
parent cadb3054cf0231a074521646ba5ca2a360365fd7
parent 94c5fb342bbb04bcf099807752243c84b26b9a9b

Merge "CaptivePortal: login activity UI improvements" into oc-dev

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 5d20cf3..c9fba95 100644
--- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
+++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
@@ -122,6 +122,11 @@
         WebSettings webSettings = myWebView.getSettings();
         webSettings.setJavaScriptEnabled(true);
         webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE);
+        webSettings.setUseWideViewPort(true);
+        webSettings.setLoadWithOverviewMode(true);
+        webSettings.setSupportZoom(true);
+        webSettings.setBuiltInZoomControls(true);
+        webSettings.setDisplayZoomControls(false);
         mWebViewClient = new MyWebViewClient();
         myWebView.setWebViewClient(mWebViewClient);
         myWebView.setWebChromeClient(new MyWebChromeClient());