commit 9c019da0f3083c4b82552fb2fe5b052f90073cb9
author Bryan Mawhinney <bryanmawhinney@google.com> Tue Nov 30 11:10:58 2010 +0000
committer Bryan Mawhinney <bryanmawhinney@google.com> Tue Nov 30 11:10:58 2010 +0000
tree 3f8eba42444cf2948a833af58b7a6a06b40c5edf
parent 5b54f405b4a1afcf57b5ccee2026a00a1004be20

Ensure default card matrix is set before creating cards.

Change-Id: I3fd55a3332f319c2a3a7a9c9f1a1351e48c0d178

carousel/java/com/android/ex/carousel/CarouselController.java

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 void onSurfaceChanged() {
         setSlotCount(mSlotCount);
+        setDefaultCardMatrix(mDefaultCardMatrix);
         createCards(mCardCount);
         setVisibleSlots(mVisibleSlots);
         setVisibleDetails(mVisibleDetails);
@@ -116,7 +117,6 @@
         setDefaultBitmap(mDefaultBitmap);
         setLoadingBitmap(mLoadingBitmap);
         setDefaultGeometry(mDefaultGeometry);
-        setDefaultCardMatrix(mDefaultCardMatrix);
         setLoadingGeometry(mLoadingGeometry);
         setBackgroundColor(mBackgroundColor.x, mBackgroundColor.y, mBackgroundColor.z,
                 mBackgroundColor.w);