summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/NavigationBarPhone.java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-08-19 13:26:43 -0700
committerJohn Reck <jreck@google.com>2011-08-19 13:26:43 -0700
commit42229bcdea8a1623d9ac3fce099793a3767fb14d (patch)
tree3069825c505174e5b67d4be65bd5714db75f27f3 /src/com/android/browser/NavigationBarPhone.java
parent0d7c69e9621a860f467a3e3171ee4962ad793df9 (diff)
downloadpackages_apps_Browser-42229bcdea8a1623d9ac3fce099793a3767fb14d.tar.gz
packages_apps_Browser-42229bcdea8a1623d9ac3fce099793a3767fb14d.tar.bz2
packages_apps_Browser-42229bcdea8a1623d9ac3fce099793a3767fb14d.zip
YAMR - Yet Another Menu Reorg
Bug: 5186166 Change-Id: Icd459c8f9cd557659a5402431a843a856fb1b134
Diffstat (limited to 'src/com/android/browser/NavigationBarPhone.java')
-rw-r--r--src/com/android/browser/NavigationBarPhone.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/browser/NavigationBarPhone.java b/src/com/android/browser/NavigationBarPhone.java
index d2d3797e5..5cabe3180 100644
--- a/src/com/android/browser/NavigationBarPhone.java
+++ b/src/com/android/browser/NavigationBarPhone.java
@@ -27,11 +27,12 @@ import android.webkit.WebView;
import android.widget.ImageView;
import android.widget.PopupMenu;
import android.widget.PopupMenu.OnDismissListener;
+import android.widget.PopupMenu.OnMenuItemClickListener;
import com.android.browser.UrlInputView.StateListener;
public class NavigationBarPhone extends NavigationBarBase implements
- StateListener {
+ StateListener, OnMenuItemClickListener, OnDismissListener {
private ImageView mStopButton;
private ImageView mVoiceButton;
@@ -81,7 +82,6 @@ public class NavigationBarPhone extends NavigationBarBase implements
mStopDescription = res.getString(R.string.accessibility_button_stop);
mRefreshDescription = res.getString(R.string.accessibility_button_refresh);
mTextfieldBgDrawable = res.getDrawable(R.drawable.textfield_active_holo_dark);
- setUaSwitcher(mComboIcon);
mUrlInput.setContainer(this);
mUrlInput.setStateListener(this);
mNeedsMenu = !ViewConfiguration.get(getContext()).hasPermanentMenuKey();
@@ -182,7 +182,6 @@ public class NavigationBarPhone extends NavigationBarBase implements
if (menu == mPopupMenu) {
onMenuHidden();
}
- super.onDismiss(menu);
}
private void onMenuHidden() {
@@ -240,4 +239,9 @@ public class NavigationBarPhone extends NavigationBarBase implements
? View.VISIBLE : View.GONE);
}
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ return mUiController.onOptionsItemSelected(item);
+ }
+
}