diff options
| author | Leon Scroggins <scroggo@google.com> | 2009-10-16 08:59:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-16 08:59:57 -0700 |
| commit | badcfad83c548a20fc82a5b5ca195a2baacbd6d5 (patch) | |
| tree | 89f5b7416d42edaaf25b996b0730c9e5f782cc78 /src/com/android/browser/BrowserBookmarksPage.java | |
| parent | de353621650d17a412b6ffe2cbf0366db5f11c40 (diff) | |
| parent | b3968bbcc96450d45bae2a667cf5ff884070fb10 (diff) | |
| download | packages_apps_browser-badcfad83c548a20fc82a5b5ca195a2baacbd6d5.zip packages_apps_browser-badcfad83c548a20fc82a5b5ca195a2baacbd6d5.tar.gz packages_apps_browser-badcfad83c548a20fc82a5b5ca195a2baacbd6d5.tar.bz2 | |
am b3968bbc: Disable thumbnail view mode for most visited page.
Merge commit 'b3968bbcc96450d45bae2a667cf5ff884070fb10' into eclair-mr2
* commit 'b3968bbcc96450d45bae2a667cf5ff884070fb10':
Disable thumbnail view mode for most visited page.
Diffstat (limited to 'src/com/android/browser/BrowserBookmarksPage.java')
| -rw-r--r-- | src/com/android/browser/BrowserBookmarksPage.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java index 535f0db..2773089 100644 --- a/src/com/android/browser/BrowserBookmarksPage.java +++ b/src/com/android/browser/BrowserBookmarksPage.java @@ -257,9 +257,8 @@ public class BrowserBookmarksPage extends Activity implements // bookmarks. Otherwise default to grid mode. BookmarkViewMode preference = BookmarkViewMode.NONE; if (mMostVisited) { - preference = BookmarkViewMode.values()[p.getInt( - PREF_MOST_VISITED_VIEW_MODE, - BookmarkViewMode.GRID.ordinal())]; + // For the most visited page, only use list mode. + preference = BookmarkViewMode.LIST; } else { preference = BookmarkViewMode.values()[p.getInt( PREF_BOOKMARK_VIEW_MODE, BookmarkViewMode.GRID.ordinal())]; @@ -480,12 +479,9 @@ public class BrowserBookmarksPage extends Activity implements @Override public boolean onCreateOptionsMenu(Menu menu) { boolean result = super.onCreateOptionsMenu(menu); - if (!mCreateShortcut) { + if (!mCreateShortcut && !mMostVisited) { MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.bookmarks, menu); - // Most visited page does not have an option to bookmark the last - // viewed page. - menu.findItem(R.id.new_context_menu_id).setVisible(!mMostVisited); return true; } return result; @@ -494,7 +490,8 @@ public class BrowserBookmarksPage extends Activity implements @Override public boolean onPrepareOptionsMenu(Menu menu) { boolean result = super.onPrepareOptionsMenu(menu); - if (mCreateShortcut || mBookmarksAdapter.getCount() == 0) { + if (mCreateShortcut || mMostVisited + || mBookmarksAdapter.getCount() == 0) { // No need to show the menu if there are no items. return result; } |