Show OverFlow menu always

OverFlow menu will always show irrespective
of device hardware button configuration

Change-Id: Ic499d906292a708b1aa0435ebd5dfbf97f563d4f
diff --git a/src/com/android/browser/NavScreen.java b/src/com/android/browser/NavScreen.java
index d8bfd56..e7c4be6 100644
--- a/src/com/android/browser/NavScreen.java
+++ b/src/com/android/browser/NavScreen.java
@@ -137,10 +137,6 @@
                 onCloseTab(tab);
             }
         });
-        boolean needsMenu = !ViewConfiguration.get(getContext()).hasPermanentMenuKey();
-        if (!needsMenu) {
-            mMore.setVisibility(View.GONE);
-        }
     }
 
     @Override
diff --git a/src/com/android/browser/NavigationBarBase.java b/src/com/android/browser/NavigationBarBase.java
index 0d98021..c8984cf 100644
--- a/src/com/android/browser/NavigationBarBase.java
+++ b/src/com/android/browser/NavigationBarBase.java
@@ -85,7 +85,6 @@
     private View mMore;
     private PopupMenu mPopupMenu;
     private boolean mOverflowMenuShowing;
-    private boolean mNeedsMenu;
 
     private static Bitmap mDefaultFavicon;
 
@@ -126,7 +125,6 @@
         mUrlInput.addTextChangedListener(this);
         mMore = findViewById(R.id.more_browser_settings);
         mMore.setOnClickListener(this);
-        mNeedsMenu = !ViewConfiguration.get(getContext()).hasPermanentMenuKey();
         mMagnify = (ImageView) findViewById(R.id.magnify);
         mMagnify.setOnClickListener(this);
         mFaviconTile = (SiteTileView) findViewById(R.id.favicon_view);
@@ -747,7 +745,7 @@
                 mFaviconTile.setVisibility(View.VISIBLE);
                 mMagnify.setVisibility(View.GONE);
                 mClearButton.setVisibility(View.GONE);
-                mMore.setVisibility(mNeedsMenu ? View.VISIBLE : View.GONE);
+                mMore.setVisibility(View.VISIBLE);
                 if (mUiController != null) {
                     Tab currentTab = mUiController.getCurrentTab();
                     if (currentTab != null){
diff --git a/src/com/android/browser/appmenu/AppMenu.java b/src/com/android/browser/appmenu/AppMenu.java
index 41ac97f..5f3d70f 100644
--- a/src/com/android/browser/appmenu/AppMenu.java
+++ b/src/com/android/browser/appmenu/AppMenu.java
@@ -41,7 +41,7 @@
  */
 public class AppMenu implements OnItemClickListener, OnKeyListener {
     /** Whether or not to show the software menu button in the menu. */
-    private static final boolean SHOW_SW_MENU_BUTTON = true;
+    private static final boolean SHOW_SW_MENU_BUTTON = false;
 
     private static final float LAST_ITEM_SHOW_FRACTION = 0.5f;