commit ae3b179924609963b301a1b5dc685d78c67f341f
author Vivek Sekhar <vsekhar@codeaurora.org> Mon Aug 03 12:26:41 2015 -0700
committer jrizzoli <joey@cyanogenmoditalia.it> Fri Aug 28 13:15:47 2015 +0200
tree 0223c22335c2172107f27b2bc25a46b25512ac4b
parent 96d0ccd052ef8ef8832207045b4d79e941a95667

Register for interstitial page state notification

- Block clicking on favicon when showing interstitial page
- Ensure topcontrols is always shown when showing interstitial page

src/com/android/browser/NavigationBarBase.java

diff --git a/src/com/android/browser/NavigationBarBase.java b/src/com/android/browser/NavigationBarBase.java
index ce65f16..10c091b 100644
--- a/src/com/android/browser/NavigationBarBase.java
+++ b/src/com/android/browser/NavigationBarBase.java
@@ -340,6 +340,7 @@
     @Override
     public void onClick(View v) {
         Tab currentTab = mUiController.getCurrentTab();
+        WebView wv = currentTab.getWebView();
         String url = null;
         if (currentTab != null){
             url = currentTab.getUrl();
@@ -347,7 +348,7 @@
         if (mMore == v) {
             showMenu(mMore);
         } else if (mFaviconTile == v) {
-            if (urlHasSitePrefs(url)){
+            if (urlHasSitePrefs(url) && (wv != null && !wv.isShowingInterstitialPage()) ){
                 showSiteSpecificSettings();
             }
         } else if (mMagnify == v) {

src/com/android/browser/Tab.java

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index a86b2e6..f533f6c 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -666,6 +666,20 @@
                 ui.forceDisableFullscreenMode(popup);
             }
         }
+
+        @Override
+        public void onAttachInterstitialPage(WebView mWebView) {
+            Controller controller = (Controller)mWebViewController;
+            BaseUi ui = (BaseUi) controller.getUi();
+            ui.getTitleBar().showTopControls(false);
+        }
+
+        @Override
+        public void onDetachInterstitialPage(WebView mWebView) {
+            Controller controller = (Controller)mWebViewController;
+            BaseUi ui = (BaseUi) controller.getUi();
+            ui.getTitleBar().enableTopControls(true);
+        }
     };
 
     private void syncCurrentState(WebView view, String url) {