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

Commit f27ea45a 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

Change-Id: I8f46698b23118213019226e4b9d5e6b196b010d3
parents 7a39287c 7042e290

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

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

        webSettings.setSupportZoom(true);

        webSettings.setBuiltInZoomControls(true);

        webSettings.setBuiltInZoomControls(true);

        webSettings.setDisplayZoomControls(false);

        webSettings.setDisplayZoomControls(false);

        webSettings.setDomStorageEnabled(true);

        mWebViewClient = new MyWebViewClient();

        mWebViewClient = new MyWebViewClient();

        webview.setWebViewClient(mWebViewClient);

        webview.setWebViewClient(mWebViewClient);

        webview.setWebChromeClient(new MyWebChromeClient());

        webview.setWebChromeClient(new MyWebChromeClient());

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

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

        webSettings.setLoadWithOverviewMode(true);

        webSettings.setSupportZoom(true);

        webSettings.setSupportZoom(true);

        webSettings.setBuiltInZoomControls(true);

        webSettings.setBuiltInZoomControls(true);

        webSettings.setDomStorageEnabled(true);

        mWebViewClient = new MyWebViewClient();

        mWebViewClient = new MyWebViewClient();

        mWebView.setWebViewClient(mWebViewClient);

        mWebView.setWebViewClient(mWebViewClient);

        mWebView.setWebChromeClient(new MyWebChromeClient());

        mWebView.setWebChromeClient(new MyWebChromeClient());