commit | a3dfd628cab88b8a405655ba0346ece79fb22a6e | [log] [tgz] |
---|---|---|
author | Hugo Benichi <hugobenichi@google.com> | Mon May 15 02:40:52 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon May 15 02:40:52 2017 +0000 |
tree | 5afcfb11cb0a99e13352c3c5066e2be46b136a84 | |
parent | 8cb0abe863b075c8a30d02c78dd250ad72f33495 [diff] | |
parent | b15a70deb446d69bba988edbeb4f0c904ea9db66 [diff] |
Merge "CaptivePortal: login activity UI improvements" am: cb570ec50a am: 95e0e08f61 am: 2bf886d648 am: b15a70deb4 Change-Id: I77c6e2c062d9c6b73f976b74b6c6fd3b94f5ee4c
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());