summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2013-05-31 16:53:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-05-31 16:53:31 +0000
commitd3992d8958aa8067c4803f113bcbab9e7f5a61b0 (patch)
tree5869844aa54629e96c1a961a0a4efec75439f480 /src/com/android/camera
parent067a56d3e43642e6ddfdad357ba6bdf4b3d2015f (diff)
parentaccc6e55bbf0186be316e81fb4e82da4731f72e0 (diff)
downloadandroid_packages_apps_Snap-d3992d8958aa8067c4803f113bcbab9e7f5a61b0.tar.gz
android_packages_apps_Snap-d3992d8958aa8067c4803f113bcbab9e7f5a61b0.tar.bz2
android_packages_apps_Snap-d3992d8958aa8067c4803f113bcbab9e7f5a61b0.zip
Merge "Don't use the same drawable for every view." into gb-ub-photos-carlsbad
Diffstat (limited to 'src/com/android/camera')
-rw-r--r--src/com/android/camera/data/CameraDataAdapter.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/data/CameraDataAdapter.java b/src/com/android/camera/data/CameraDataAdapter.java
index 2bce1b4fd..1e5f1a8f0 100644
--- a/src/com/android/camera/data/CameraDataAdapter.java
+++ b/src/com/android/camera/data/CameraDataAdapter.java
@@ -106,7 +106,8 @@ public class CameraDataAdapter implements FilmStripView.DataAdapter {
}
return mImages.get(dataID).getView(
- c, mSuggestedWidth, mSuggestedHeight, mPlaceHolder);
+ c, mSuggestedWidth, mSuggestedHeight,
+ mPlaceHolder.getConstantState().newDrawable());
}
@Override