| commit | f27ea45a901fa91cccacbcf2fc6dfa662c874cbb | [log] [tgz] |
|---|---|---|
| author | Sehee Park <sehee32.park@samsung.com> | Wed Feb 13 20:57:13 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 13 20:57:13 2019 -0800 |
| tree | a834ebb741247bda3cffcf3165709929a3991676 | |
| parent | 7a39287ca022ad97c36ba81ff7a294026e22460f [diff] | |
| parent | 7042e290cf0c4d5518d2ed667d25e56bba95e848 [diff] |
Merge "Enable DOM storage API for CaptivePortalLoginActivity" am: f7150486bf am: 7042e290cf Change-Id: I8f46698b23118213019226e4b9d5e6b196b010d3
diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java index 9b70ff3..2c9b6eb 100644 --- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java +++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
@@ -174,6 +174,7 @@ webSettings.setSupportZoom(true); webSettings.setBuiltInZoomControls(true); webSettings.setDisplayZoomControls(false); + webSettings.setDomStorageEnabled(true); mWebViewClient = new MyWebViewClient(); webview.setWebViewClient(mWebViewClient); webview.setWebChromeClient(new MyWebChromeClient());
diff --git a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java index f36b4aa..55c9361 100644 --- a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java +++ b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
@@ -106,6 +106,7 @@ webSettings.setLoadWithOverviewMode(true); webSettings.setSupportZoom(true); webSettings.setBuiltInZoomControls(true); + webSettings.setDomStorageEnabled(true); mWebViewClient = new MyWebViewClient(); mWebView.setWebViewClient(mWebViewClient); mWebView.setWebChromeClient(new MyWebChromeClient());