diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-19 09:06:15 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-19 09:06:15 -0700 |
| commit | e9f8f00aef6a2d3bcb4975b558a6e14d5929cb73 (patch) | |
| tree | 021167dab38dab105c2a6a1dbb1080ea0b7d5046 /src/com/android | |
| parent | 3936209d56f258bf718d7167da99c827661f5db6 (diff) | |
| parent | 8382d99dee5f2e60cc8a59f144db53db848c6e97 (diff) | |
| download | packages_apps_browser-e9f8f00aef6a2d3bcb4975b558a6e14d5929cb73.zip packages_apps_browser-e9f8f00aef6a2d3bcb4975b558a6e14d5929cb73.tar.gz packages_apps_browser-e9f8f00aef6a2d3bcb4975b558a6e14d5929cb73.tar.bz2 | |
Merge change 21887 into eclair
* changes:
Fix a crash.
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/browser/BrowserBookmarksPage.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java index c97cc00..cf2dbc0 100644 --- a/src/com/android/browser/BrowserBookmarksPage.java +++ b/src/com/android/browser/BrowserBookmarksPage.java @@ -441,9 +441,10 @@ public class BrowserBookmarksPage extends Activity implements @Override public boolean onPrepareOptionsMenu(Menu menu) { - if (mBookmarksAdapter.getCount() == 0) { + boolean result = super.onPrepareOptionsMenu(menu); + if (mCreateShortcut || mBookmarksAdapter.getCount() == 0) { // No need to show the menu if there are no items. - return false; + return result; } menu.findItem(R.id.switch_mode_menu_id).setTitle( mGridMode ? R.string.switch_to_list |