Fix a bug causing store config to be lost on rotate

Store configs were getting lost on orientation change,
since they weren't being stored right. This fixes that.

Change-Id: I4b256764347e3e7462fb4532254565d81bfc8980

2 files changed, 11 insertions, 1 deletions

diff --git a/carousel/java/com/android/ex/carousel/CarouselController.java b/carousel/java/com/android/ex/carousel/CarouselController.java
index fd94a7d..762fa58 100644
--- a/carousel/java/com/android/ex/carousel/CarouselController.java
+++ b/carousel/java/com/android/ex/carousel/CarouselController.java
@@ -90,6 +90,7 @@ public class CarouselController {
     private int mDragModel = CarouselRS.DRAG_MODEL_SCREEN_DELTA;
     private int mFillDirection = CarouselRS.FILL_DIRECTION_CCW;
     private boolean mFirstCardTop = false;
+    private int[] mStoreConfigs;
 
     public CarouselController() {
         boolean useDepthBuffer = true;
@@ -136,6 +137,7 @@ public class CarouselController {
         setRezInCardCount(mRezInCardCount);
         setFadeInDuration(mFadeInDuration);
         setDetailLoadingBitmap(mDetailLoadingBitmap);
+        setStoreConfigs(mStoreConfigs);
     }
 
     /**
@@ -755,6 +757,9 @@ public class CarouselController {
      * @param configs An array, each element of which corresponds to an ordered mesh primitive
      */
     public void setStoreConfigs(int configs[]) {
-        mRenderScript.setStoreConfigs(configs);
+        mStoreConfigs = configs;
+        if (mRenderScript != null) {
+            mRenderScript.setStoreConfigs(configs);
+        }
     }
 }
diff --git a/carousel/java/com/android/ex/carousel/CarouselRS.java b/carousel/java/com/android/ex/carousel/CarouselRS.java
index 371429e..2867d98 100644
--- a/carousel/java/com/android/ex/carousel/CarouselRS.java
+++ b/carousel/java/com/android/ex/carousel/CarouselRS.java
@@ -487,6 +487,11 @@ public class CarouselRS  {
     }
 
     public void setStoreConfigs(int configs[]) {
+        if (configs == null) {
+            initProgramStore();
+            return;
+        }
+
         final int count = configs.length;
 
         resizeProgramStoresCard(count);