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

Commit 05141df1 authored by Sehee Park's avatar Sehee Park Committed by android-build-merger
Browse files

Merge "Enable DOM storage API for CaptivePortalLoginActivity" am: f7150486 am: 7042e290 

am: f27ea45a

Change-Id: Ie07ab945aa6a5c997f776f237f757c533cc1d453
parents ef50734c f27ea45a

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

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ public class CaptivePortalLoginActivity extends Activity { 
        webSettings.setSupportZoom(true);

        webSettings.setBuiltInZoomControls(true);

        webSettings.setDisplayZoomControls(false);

        webSettings.setDomStorageEnabled(true);

        mWebViewClient = new MyWebViewClient();

        webview.setWebViewClient(mWebViewClient);

        webview.setWebChromeClient(new MyWebChromeClient());

packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ public class CaptivePortalLoginActivity extends Activity { 
        webSettings.setLoadWithOverviewMode(true);

        webSettings.setSupportZoom(true);

        webSettings.setBuiltInZoomControls(true);

        webSettings.setDomStorageEnabled(true);

        mWebViewClient = new MyWebViewClient();

        mWebView.setWebViewClient(mWebViewClient);

        mWebView.setWebChromeClient(new MyWebChromeClient());