Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3dfd628 authored by Hugo Benichi's avatar Hugo Benichi Committed by android-build-merger
Browse files

Merge "CaptivePortal: login activity UI improvements" am: cb570ec5 am: 95e0e08f am: 2bf886d6 

am: b15a70de

Change-Id: I77c6e2c062d9c6b73f976b74b6c6fd3b94f5ee4c
parents 8cb0abe8 b15a70de

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -122,6 +122,11 @@ public class CaptivePortalLoginActivity extends Activity { 
        WebSettings webSettings = myWebView.getSettings();

        WebSettings webSettings = myWebView.getSettings();

        webSettings.setJavaScriptEnabled(true);

        webSettings.setJavaScriptEnabled(true);

        webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE);

        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();

        mWebViewClient = new MyWebViewClient();

        myWebView.setWebViewClient(mWebViewClient);

        myWebView.setWebViewClient(mWebViewClient);

        myWebView.setWebChromeClient(new MyWebChromeClient());

        myWebView.setWebChromeClient(new MyWebChromeClient());