diff options
| author | Michael Kolb <kolby@google.com> | 2011-07-28 15:10:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-28 15:10:49 -0700 |
| commit | 02969835f7bef1e7f092b3c161aa347f6488f772 (patch) | |
| tree | afad4375ebf4b0e51e9e940296676bfbce26e24d /src | |
| parent | 4e310c9873aa84ba4888327f88ac065d51874071 (diff) | |
| parent | b2e91fdb56c13452c6c5e5fd39ce17e7db323bdc (diff) | |
| download | packages_apps_Browser-02969835f7bef1e7f092b3c161aa347f6488f772.tar.gz packages_apps_Browser-02969835f7bef1e7f092b3c161aa347f6488f772.tar.bz2 packages_apps_Browser-02969835f7bef1e7f092b3c161aa347f6488f772.zip | |
Merge "fix url menu"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/NavigationBarBase.java | 2 | ||||
| -rw-r--r-- | src/com/android/browser/NavigationBarPhone.java | 8 | ||||
| -rw-r--r-- | src/com/android/browser/XLargeUi.java | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/src/com/android/browser/NavigationBarBase.java b/src/com/android/browser/NavigationBarBase.java index a0593522d..724dcc84e 100644 --- a/src/com/android/browser/NavigationBarBase.java +++ b/src/com/android/browser/NavigationBarBase.java @@ -74,7 +74,6 @@ public class NavigationBarBase extends LinearLayout implements OnClickListener, mFavicon = (ImageView) findViewById(R.id.favicon); mUrlInput = (UrlInputView) findViewById(R.id.url); mUrlInput.setUrlInputListener(this); - mUrlInput.setController(mUiController); mUrlInput.setOnFocusChangeListener(this); mUrlInput.setSelectAllOnFocus(true); mUrlInput.addQueryTextWatcher(this); @@ -84,6 +83,7 @@ public class NavigationBarBase extends LinearLayout implements OnClickListener, mTitleBar = titleBar; mBaseUi = mTitleBar.getUi(); mUiController = mTitleBar.getUiController(); + mUrlInput.setController(mUiController); } public void setLock(Drawable d) { diff --git a/src/com/android/browser/NavigationBarPhone.java b/src/com/android/browser/NavigationBarPhone.java index 400b6955a..388c262a9 100644 --- a/src/com/android/browser/NavigationBarPhone.java +++ b/src/com/android/browser/NavigationBarPhone.java @@ -86,14 +86,6 @@ public class NavigationBarPhone extends NavigationBarBase implements } @Override - public void createContextMenu(ContextMenu menu) { - Activity activity = mBaseUi.getActivity(); - MenuInflater inflater = activity.getMenuInflater(); - inflater.inflate(R.menu.title_context, menu); - activity.onCreateContextMenu(menu, this, null); - } - - @Override protected void setSearchMode(boolean voiceSearchEnabled) { boolean showvoicebutton = voiceSearchEnabled && mUiController.supportsVoiceSearch(); diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java index aeba7cffb..301e09f4a 100644 --- a/src/com/android/browser/XLargeUi.java +++ b/src/com/android/browser/XLargeUi.java @@ -253,7 +253,7 @@ public class XLargeUi extends BaseUi { @Override public void onActionModeStarted(ActionMode mode) { if (!mTitleBar.isEditingUrl()) { - // hide the fake title bar when CAB is shown + // hide the title bar when CAB is shown hideTitleBar(); } } |