From 328ea87539544e6aff7d850347ce9b57ba4ce1ad Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Wed, 16 Sep 2009 13:33:29 +0100
Subject: Make the view mode that the user sets (either grid or list) in the
 bookmarks/most visited page sticky.

Change-Id: I67db0ef2997a5948491223a5ae17fd4aa0356e94
---
 src/com/android/browser/BrowserBookmarksAdapter.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/com/android/browser/BrowserBookmarksAdapter.java')

diff --git a/src/com/android/browser/BrowserBookmarksAdapter.java b/src/com/android/browser/BrowserBookmarksAdapter.java
index 5fb67d0b0..a7fa19c34 100644
--- a/src/com/android/browser/BrowserBookmarksAdapter.java
+++ b/src/com/android/browser/BrowserBookmarksAdapter.java
@@ -51,7 +51,7 @@ class BrowserBookmarksAdapter extends BaseAdapter {
     private BrowserBookmarksPage    mBookmarksPage;
     private ContentResolver         mContentResolver;
     private boolean                 mDataValid;
-    private boolean                 mGridMode;
+    private BookmarkViewMode        mViewMode;
     private boolean                 mMostVisited;
     private boolean                 mNeedsOffset;
     private int                     mExtraOffset;
@@ -82,7 +82,7 @@ class BrowserBookmarksAdapter extends BaseAdapter {
                 + curPage;
         mCurrentTitle = curTitle;
         mContentResolver = b.getContentResolver();
-        mGridMode = false;
+        mViewMode = BookmarkViewMode.LIST;
 
         String whereClause;
         // FIXME: Should have a default sort order that the user selects.
@@ -377,8 +377,8 @@ class BrowserBookmarksAdapter extends BaseAdapter {
         return position;
     }
 
-    /* package */ void switchViewMode(boolean toGrid) {
-        mGridMode = toGrid;
+    /* package */ void switchViewMode(BookmarkViewMode viewMode) {
+        mViewMode = viewMode;
     }
 
     /* package */ void populateBookmarkItem(BookmarkItem b, int position) {
@@ -406,7 +406,7 @@ class BrowserBookmarksAdapter extends BaseAdapter {
             throw new AssertionError(
                     "BrowserBookmarksAdapter tried to get a view out of range");
         }
-        if (mGridMode) {
+        if (mViewMode == BookmarkViewMode.GRID) {
             if (convertView == null || convertView instanceof AddNewBookmark
                     || convertView instanceof BookmarkItem) {
                 LayoutInflater factory = LayoutInflater.from(mBookmarksPage);
-- 
cgit v1.2.3