commit 4d25d129d1c9f92033382e12260d3f40521cf3fd
author John Hoford <hoford@google.com> Wed May 22 20:08:26 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 22 20:08:26 2013 +0000
tree 389e381dd8bc96719e6d6025c46b9b7ce089de84
parent cdc87e62ee28b5022b2e4d0bc756c264cc26d8e9
parent 52fab9f1595cfcabe85d81325bdb9b486bc8c306

Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce

src/com/android/gallery3d/filtershow/category/CategoryAdapter.java

diff --git a/src/com/android/gallery3d/filtershow/category/CategoryAdapter.java b/src/com/android/gallery3d/filtershow/category/CategoryAdapter.java
index 4dfaa7f..cfa64bc 100644
--- a/src/com/android/gallery3d/filtershow/category/CategoryAdapter.java
+++ b/src/com/android/gallery3d/filtershow/category/CategoryAdapter.java
@@ -96,7 +96,7 @@
                     new ListView.LayoutParams(mItemWidth, mItemHeight));
             view.setTag(position);
             if (mCategory == MainPanel.LOOKS || mCategory == MainPanel.BORDERS) {
-                view.setBackground(null);
+                view.setBackgroundResource(0);
             }
             return view;
         }

src/com/android/photos/data/GalleryBitmapPool.java

diff --git a/src/com/android/photos/data/GalleryBitmapPool.java b/src/com/android/photos/data/GalleryBitmapPool.java
index a5a17ed..aca3e4b 100644
--- a/src/com/android/photos/data/GalleryBitmapPool.java
+++ b/src/com/android/photos/data/GalleryBitmapPool.java
@@ -19,7 +19,7 @@
 import android.graphics.Bitmap;
 import android.graphics.Point;
 import android.util.Pools.Pool;
-import android.util.Pools.SimplePool;
+import android.util.Pools.SynchronizedPool;
 
 import com.android.photos.data.SparseArrayBitmapPool.Node;
 
@@ -36,7 +36,7 @@
 
     private int mCapacityBytes;
     private SparseArrayBitmapPool [] mPools;
-    private Pool<Node> mSharedNodePool = new SimplePool<Node>(128);
+    private Pool<Node> mSharedNodePool = new SynchronizedPool<Node>(128);
 
     private GalleryBitmapPool(int capacityBytes) {
         mPools = new SparseArrayBitmapPool[3];