commit 800171308ed901de39f3861114f1a24da3bbbb7b
author Sagar Dhawan <sdhawan@codeaurora.org> Wed Sep 16 14:38:33 2015 -0700
committer jrizzoli <joey@cyanogenmoditalia.it> Thu Nov 05 14:22:57 2015 +0100
tree 4a4e4487855f831da63d2ee860337ed1463b57f1
parent 5cbc69682395304ffb42d017fababaa963adaef2

Fix system Navigation bar covering menu when fullscreen

Fixed one case of the navigation bar covering the app
menu popup.

Needed to make the popup non-modal before showing it
and modal immediately after so that it can be
interacted with.

This will happen only when Immersive mode is in use
since testing doesn't work with non-modal popups.

CR-Fixed: 903500

Change-Id: Ia265d434a96822e8c1095e89aa42f67a335a13ff

src/com/android/browser/BrowserPreferencesPage.java

diff --git a/src/com/android/browser/BrowserPreferencesPage.java b/src/com/android/browser/BrowserPreferencesPage.java
index 46fde6a..e0e7095 100644
--- a/src/com/android/browser/BrowserPreferencesPage.java
+++ b/src/com/android/browser/BrowserPreferencesPage.java
@@ -79,8 +79,11 @@
             }
 
             Bundle extras = intent.getExtras();
-            if (extras == null)
+            if (extras == null){
+                getFragmentManager().beginTransaction().replace(android.R.id.content,
+                        new GeneralPreferencesFragment()).commit();
                 return;
+            }
 
             String fragment = (String) extras.getCharSequence(PreferenceActivity.EXTRA_SHOW_FRAGMENT);
             if (fragment != null) {

src/com/android/browser/appmenu/AppMenu.java

diff --git a/src/com/android/browser/appmenu/AppMenu.java b/src/com/android/browser/appmenu/AppMenu.java
index 8453464..f0b9a5a 100644
--- a/src/com/android/browser/appmenu/AppMenu.java
+++ b/src/com/android/browser/appmenu/AppMenu.java
@@ -26,6 +26,8 @@
 import android.widget.PopupWindow.OnDismissListener;
 
 import org.chromium.base.SysUtils;
+
+import com.android.browser.BrowserSettings;
 import com.android.browser.R;
 
 import java.util.ArrayList;
@@ -159,7 +161,12 @@
         setMenuHeight(menuItems.size(), visibleDisplayFrame, screenHeight, sizingPadding);
         setPopupOffset(mPopup, mCurrentScreenRotation, visibleDisplayFrame, sizingPadding);
         mPopup.setOnItemClickListener(this);
+        boolean isImmersive = BrowserSettings.getInstance().useFullscreen();
+        if (isImmersive)
+            mPopup.setModal(false); //Disable modal here(it's required until this point)
         mPopup.show();
+        if (isImmersive)
+            mPopup.setModal(true); //Set modal after show, so that Immersive Mode doesn't break
         mPopup.getListView().setItemsCanFocus(true);
         mPopup.getListView().setOnKeyListener(this);