commit 68faf1c714461e500a5dbfc1156c074e12137391
author Pankaj Garg <pgarg@codeaurora.org> Fri Jun 26 17:07:37 2015 -0700
committer jrizzoli <joey@cyanogenmoditalia.it> Fri Aug 28 13:15:45 2015 +0200
tree 4cd7de9c9d4d9328509f9c386a67a929810fc402
parent ce624d4eb0df16ebd5cfefda9aaf93d5f6a4ad99

SWE UI cleanup

- ActionBar color and styling for KK
- Use High Res icon for bookmarks
- Edge Nav setting string
- Combo view cleanup
- Tablet UI cleanup

Change-Id: I1859226e80d9943ee6af30c2cc9a5bd9ce5b9399

src/com/android/browser/BrowserBookmarksAdapter.java

diff --git a/src/com/android/browser/BrowserBookmarksAdapter.java b/src/com/android/browser/BrowserBookmarksAdapter.java
index d9bfcea..38e07e0 100644
--- a/src/com/android/browser/BrowserBookmarksAdapter.java
+++ b/src/com/android/browser/BrowserBookmarksAdapter.java
@@ -136,8 +136,13 @@
             item = new BrowserBookmarksAdapterItem();
         }
         Bitmap thumbnail = item.thumbnail != null ? item.thumbnail.getBitmap() : null;
+
         thumbnail = BrowserBookmarksPage.getBitmap(c,
-                BookmarksLoader.COLUMN_INDEX_THUMBNAIL, thumbnail);
+                BookmarksLoader.COLUMN_INDEX_TOUCH_ICON, thumbnail);
+        if (thumbnail == null) {
+            thumbnail = BrowserBookmarksPage.getBitmap(c,
+                    BookmarksLoader.COLUMN_INDEX_THUMBNAIL, thumbnail);
+        }
         item.has_thumbnail = thumbnail != null;
         if (thumbnail != null
                 && (item.thumbnail == null || item.thumbnail.getBitmap() != thumbnail)) {