Switch to using ModelViewController-based CarouselView

Change-Id: I5cd2ff8ce9b2102ab6b10f6d6a41f87e0f3a06f3

3 files changed, 16 insertions, 5 deletions

diff --git a/carousel/test/src/com/android/carouseltest/CarouselTestActivity.java b/carousel/test/src/com/android/carouseltest/CarouselTestActivity.java
index 8c1cffd..6f7b846 100644
--- a/carousel/test/src/com/android/carouseltest/CarouselTestActivity.java
+++ b/carousel/test/src/com/android/carouseltest/CarouselTestActivity.java
@@ -17,6 +17,7 @@
 package com.android.carouseltest;
 
 import com.android.carouseltest.MyCarouselView;
+import com.android.ex.carousel.CarouselController;
 import com.android.ex.carousel.CarouselView;
 import com.android.ex.carousel.CarouselViewHelper;
 
@@ -45,6 +46,7 @@ public class CarouselTestActivity extends Activity {
     private static final int DETAIL_TEXTURE_HEIGHT = 80;
     private static final int VISIBLE_DETAIL_COUNT = 3;
     private static final boolean INCREMENTAL_ADD = false; // To debug incrementally adding cards
+    private CarouselController mController;
     private CarouselView mView;
     private Paint mPaint = new Paint();
     private CarouselViewHelper mHelper;
@@ -119,7 +121,8 @@ public class CarouselTestActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mView = new MyCarouselView(this);
+        mController = new CarouselController();
+        mView = new MyCarouselView(this, mController);
         mView.getHolder().setFormat(PixelFormat.TRANSLUCENT);
         mPaint.setColor(0xffffffff);
         final Resources res = getResources();
diff --git a/carousel/test/src/com/android/carouseltest/MyCarouselView.java b/carousel/test/src/com/android/carouseltest/MyCarouselView.java
index b9ee6b1..f028e6c 100644
--- a/carousel/test/src/com/android/carouseltest/MyCarouselView.java
+++ b/carousel/test/src/com/android/carouseltest/MyCarouselView.java
@@ -19,17 +19,22 @@ package com.android.carouseltest;
 import android.content.Context;
 import android.util.AttributeSet;
 
+import com.android.ex.carousel.CarouselController;
 import com.android.ex.carousel.CarouselView;
 import com.android.ex.carousel.CarouselView.Info;
 
 public class MyCarouselView extends CarouselView {
 
-    public MyCarouselView(Context context) {
-        this(context, null);
+    public MyCarouselView(Context context, CarouselController controller) {
+        this(context, null, controller);
     }
 
     public MyCarouselView(Context context, AttributeSet attrs) {
-        super(context, attrs);
+        this(context, attrs, new CarouselController());
+    }
+
+    public MyCarouselView(Context context, AttributeSet attrs, CarouselController controller) {
+        super(context, attrs, controller);
     }
 
     public Info getRenderScriptInfo() {
diff --git a/carousel/test/src/com/android/carouseltest/TaskSwitcherActivity.java b/carousel/test/src/com/android/carouseltest/TaskSwitcherActivity.java
index 5199fa1..d6c4829 100644
--- a/carousel/test/src/com/android/carouseltest/TaskSwitcherActivity.java
+++ b/carousel/test/src/com/android/carouseltest/TaskSwitcherActivity.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.List;
 import com.android.carouseltest.R;
 
+import com.android.ex.carousel.CarouselController;
 import com.android.ex.carousel.CarouselViewHelper;
 
 import android.app.Activity;
@@ -58,6 +59,7 @@ public class TaskSwitcherActivity extends Activity {
     private boolean mPortraitMode = true;
     private ArrayList<ActivityDescription> mActivityDescriptions
             = new ArrayList<ActivityDescription>();
+    private CarouselController mController;
     private MyCarouselView mView;
     private Bitmap mBlankBitmap = Bitmap.createBitmap(128, 128, Config.RGB_565);
     private LocalCarouselViewHelper mHelper;
@@ -200,7 +202,8 @@ public class TaskSwitcherActivity extends Activity {
         final Resources res = getResources();
         final View decorView = getWindow().getDecorView();
 
-        mView = new MyCarouselView(this);
+        mController = new CarouselController();
+        mView = new MyCarouselView(this, mController);
         mHelper = new LocalCarouselViewHelper(this);
         mHelper.setCarouselView(mView);
         mView.setSlotCount(CARD_SLOTS);