summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/TitleBarXLarge.java
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2010-08-10 17:52:34 -0700
committerMichael Kolb <kolby@google.com>2010-08-13 10:29:05 -0700
commited217745066c160f785626e9a15ebe70af5e25e4 (patch)
tree963a7f797a48b40d2f57d43288f918e25d157c3f /src/com/android/browser/TitleBarXLarge.java
parent8b139744c1138351fb8e3fff280cf45dd056fa85 (diff)
downloadpackages_apps_Browser-ed217745066c160f785626e9a15ebe70af5e25e4.tar.gz
packages_apps_Browser-ed217745066c160f785626e9a15ebe70af5e25e4.tar.bz2
packages_apps_Browser-ed217745066c160f785626e9a15ebe70af5e25e4.zip
switched to using action bar for large screen
Change-Id: I33b6bcd78d4983e0ce1b503d3756687588dd8ed0
Diffstat (limited to 'src/com/android/browser/TitleBarXLarge.java')
-rw-r--r--src/com/android/browser/TitleBarXLarge.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index c1fdee3a1..f858e2ea9 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -49,7 +49,6 @@ public class TitleBarXLarge extends TitleBarBase
private View mStar;
private View mSearchButton;
private ImageView mStopButton;
- private View mMenu;
private View mAllButton;
private ImageView mProgressView;
private UrlInputView mUrlView;
@@ -76,7 +75,6 @@ public class TitleBarXLarge extends TitleBarBase
mBackButton = findViewById(R.id.back);
mForwardButton = findViewById(R.id.forward);
mStar = findViewById(R.id.star);
- mMenu = findViewById(R.id.menu);
mStopButton = (ImageView) findViewById(R.id.stop);
mSearchButton = findViewById(R.id.search);
mLockIcon = (ImageView) findViewById(R.id.lock);
@@ -89,7 +87,6 @@ public class TitleBarXLarge extends TitleBarBase
mAllButton.setOnClickListener(this);
mStopButton.setOnClickListener(this);
mSearchButton.setOnClickListener(this);
- mMenu.setOnClickListener(this);
mUrlView.setUrlInputListener(this);
}
@@ -101,8 +98,6 @@ public class TitleBarXLarge extends TitleBarBase
mBrowserActivity.getTopWindow().goForward();
} else if (mStar == v) {
mBrowserActivity.promptAddOrInstallBookmark();
- } else if (mMenu == v) {
- mBrowserActivity.openOptionsMenu();
} else if (mAllButton == v) {
mBrowserActivity.bookmarksOrHistoryPicker(false, false);
} else if (mSearchButton == v) {
@@ -135,6 +130,7 @@ public class TitleBarXLarge extends TitleBarBase
public void onDismiss() {
mBrowserActivity.getTabControl().getCurrentTopWebView().requestFocus();
mBrowserActivity.hideFakeTitleBar();
+ mUrlView.setText(mBrowserActivity.getTabControl().getCurrentWebView().getUrl());
}
@Override