summaryrefslogtreecommitdiffstats
path: root/carousel/java
diff options
context:
space:
mode:
authorBryan Mawhinney <bryanmawhinney@google.com>2010-11-30 11:10:58 +0000
committerBryan Mawhinney <bryanmawhinney@google.com>2010-11-30 11:10:58 +0000
commit9c019da0f3083c4b82552fb2fe5b052f90073cb9 (patch)
tree3f8eba42444cf2948a833af58b7a6a06b40c5edf /carousel/java
parent5b54f405b4a1afcf57b5ccee2026a00a1004be20 (diff)
downloadandroid_frameworks_ex-9c019da0f3083c4b82552fb2fe5b052f90073cb9.tar.gz
android_frameworks_ex-9c019da0f3083c4b82552fb2fe5b052f90073cb9.tar.bz2
android_frameworks_ex-9c019da0f3083c4b82552fb2fe5b052f90073cb9.zip
Ensure default card matrix is set before creating cards.
Change-Id: I3fd55a3332f319c2a3a7a9c9f1a1351e48c0d178
Diffstat (limited to 'carousel/java')
-rw-r--r--carousel/java/com/android/ex/carousel/CarouselController.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/carousel/java/com/android/ex/carousel/CarouselController.java b/carousel/java/com/android/ex/carousel/CarouselController.java
index a2f1e08..7d213f7 100644
--- a/carousel/java/com/android/ex/carousel/CarouselController.java
+++ b/carousel/java/com/android/ex/carousel/CarouselController.java
@@ -103,6 +103,7 @@ public class CarouselController {
public void onSurfaceChanged() {
setSlotCount(mSlotCount);
+ setDefaultCardMatrix(mDefaultCardMatrix);
createCards(mCardCount);
setVisibleSlots(mVisibleSlots);
setVisibleDetails(mVisibleDetails);
@@ -116,7 +117,6 @@ public class CarouselController {
setDefaultBitmap(mDefaultBitmap);
setLoadingBitmap(mLoadingBitmap);
setDefaultGeometry(mDefaultGeometry);
- setDefaultCardMatrix(mDefaultCardMatrix);
setLoadingGeometry(mLoadingGeometry);
setBackgroundColor(mBackgroundColor.x, mBackgroundColor.y, mBackgroundColor.z,
mBackgroundColor.w);