Make sure we switch to preview view when resuming.

  Bug: 10640328

But we need to make sure to not always switch in onResume, as
some activities stared from us (like playing a video or editing)
require the UI flow to stay in filmstrip.

Change-Id: Id2911be4949de9fd9fc4cb3451dd34e3fae8becf

6 files changed, 24 insertions, 19 deletions

diff --git a/src/com/android/camera/data/CameraDataAdapter.java b/src/com/android/camera/data/CameraDataAdapter.java
index af9fbb8f3..892aa1056 100644
--- a/src/com/android/camera/data/CameraDataAdapter.java
+++ b/src/com/android/camera/data/CameraDataAdapter.java
@@ -16,6 +16,7 @@
 
 package com.android.camera.data;
 
+import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.database.Cursor;
@@ -94,13 +95,13 @@ public class CameraDataAdapter implements LocalDataAdapter {
     }
 
     @Override
-    public View getView(Context c, int dataID) {
+    public View getView(Activity activity, int dataID) {
         if (dataID >= mImages.size() || dataID < 0) {
             return null;
         }
 
         return mImages.get(dataID).getView(
-                c, mSuggestedWidth, mSuggestedHeight,
+                activity, mSuggestedWidth, mSuggestedHeight,
                 mPlaceHolder.getConstantState().newDrawable());
     }
 
diff --git a/src/com/android/camera/data/FixedFirstDataAdapter.java b/src/com/android/camera/data/FixedFirstDataAdapter.java
index 53eb3bb86..05923b407 100644
--- a/src/com/android/camera/data/FixedFirstDataAdapter.java
+++ b/src/com/android/camera/data/FixedFirstDataAdapter.java
@@ -16,6 +16,7 @@
 
 package com.android.camera.data;
 
+import android.app.Activity;
 import android.content.Context;
 import android.net.Uri;
 import android.view.View;
@@ -106,12 +107,12 @@ public class FixedFirstDataAdapter extends AbstractLocalDataAdapterWrapper
     }
 
     @Override
-    public View getView(Context context, int dataID) {
+    public View getView(Activity activity, int dataID) {
         if (dataID == 0) {
             return mFirstData.getView(
-                    context, mSuggestedWidth, mSuggestedHeight, null);
+                    activity, mSuggestedWidth, mSuggestedHeight, null);
         }
-        return mAdapter.getView(context, dataID - 1);
+        return mAdapter.getView(activity, dataID - 1);
     }
 
     @Override
diff --git a/src/com/android/camera/data/FixedLastDataAdapter.java b/src/com/android/camera/data/FixedLastDataAdapter.java
index a0b78aa98..a7157de19 100644
--- a/src/com/android/camera/data/FixedLastDataAdapter.java
+++ b/src/com/android/camera/data/FixedLastDataAdapter.java
@@ -16,6 +16,7 @@
 
 package com.android.camera.data;
 
+import android.app.Activity;
 import android.content.Context;
 import android.net.Uri;
 import android.view.View;
@@ -109,13 +110,13 @@ public class FixedLastDataAdapter extends AbstractLocalDataAdapterWrapper {
     }
 
     @Override
-    public View getView(Context context, int dataID) {
+    public View getView(Activity activity, int dataID) {
         int totalNumber = mAdapter.getTotalNumber();
 
         if (dataID < totalNumber) {
-            return mAdapter.getView(context, dataID);
+            return mAdapter.getView(activity, dataID);
         } else if (dataID == totalNumber) {
-            return mLastData.getView(context,
+            return mLastData.getView(activity,
                     mSuggestedWidth, mSuggestedHeight, null);
         }
 
diff --git a/src/com/android/camera/data/LocalData.java b/src/com/android/camera/data/LocalData.java
index 2db4ac577..844cc5548 100644
--- a/src/com/android/camera/data/LocalData.java
+++ b/src/com/android/camera/data/LocalData.java
@@ -16,10 +16,10 @@
 
 package com.android.camera.data;
 
+import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.net.Uri;
 import android.view.View;
 
 import com.android.camera.ui.FilmStripView;
@@ -68,7 +68,7 @@ public interface LocalData extends FilmStripView.ImageData {
      */
     public static final int LOCAL_360_PHOTO_SPHERE = 6;
 
-    View getView(Context c, int width, int height, Drawable placeHolder);
+    View getView(Activity a, int width, int height, Drawable placeHolder);
 
     /**
      * Gets the date when this data is created. The returned date is also used
diff --git a/src/com/android/camera/data/LocalMediaData.java b/src/com/android/camera/data/LocalMediaData.java
index 53c153c0c..8e5216d17 100644
--- a/src/com/android/camera/data/LocalMediaData.java
+++ b/src/com/android/camera/data/LocalMediaData.java
@@ -16,6 +16,7 @@
 
 package com.android.camera.data;
 
+import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.database.Cursor;
@@ -205,9 +206,9 @@ public abstract class LocalMediaData implements LocalData {
     }
 
     @Override
-    public View getView(Context ctx,
+    public View getView(Activity activity,
             int decodeWidth, int decodeHeight, Drawable placeHolder) {
-        return fillImageView(ctx, new ImageView(ctx),
+        return fillImageView(activity, new ImageView(activity),
                 decodeWidth, decodeHeight, placeHolder);
     }
 
@@ -680,18 +681,18 @@ public abstract class LocalMediaData implements LocalData {
         }
 
         @Override
-        public View getView(final Context ctx,
+        public View getView(final Activity activity,
                 int decodeWidth, int decodeHeight, Drawable placeHolder) {
 
             // ImageView for the bitmap.
-            ImageView iv = new ImageView(ctx);
+            ImageView iv = new ImageView(activity);
             iv.setLayoutParams(new FrameLayout.LayoutParams(
                     ViewGroup.LayoutParams.MATCH_PARENT,
                     ViewGroup.LayoutParams.MATCH_PARENT, Gravity.CENTER));
-            fillImageView(ctx, iv, decodeWidth, decodeHeight, placeHolder);
+            fillImageView(activity, iv, decodeWidth, decodeHeight, placeHolder);
 
             // ImageView for the play icon.
-            ImageView icon = new ImageView(ctx);
+            ImageView icon = new ImageView(activity);
             icon.setImageResource(R.drawable.ic_control_play);
             icon.setScaleType(ImageView.ScaleType.CENTER);
             icon.setLayoutParams(new FrameLayout.LayoutParams(
@@ -700,11 +701,11 @@ public abstract class LocalMediaData implements LocalData {
             icon.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    CameraUtil.playVideo(ctx, getContentUri(), mTitle);
+                    CameraUtil.playVideo(activity, getContentUri(), mTitle);
                 }
             });
 
-            FrameLayout f = new FrameLayout(ctx);
+            FrameLayout f = new FrameLayout(activity);
             f.addView(iv);
             f.addView(icon);
             return f;
diff --git a/src/com/android/camera/data/SimpleViewData.java b/src/com/android/camera/data/SimpleViewData.java
index a49d3eac8..3ff17226a 100644
--- a/src/com/android/camera/data/SimpleViewData.java
+++ b/src/com/android/camera/data/SimpleViewData.java
@@ -16,6 +16,7 @@
 
 package com.android.camera.data;
 
+import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -114,7 +115,7 @@ public class SimpleViewData implements LocalData {
     }
 
     @Override
-    public View getView(Context c, int width, int height, Drawable placeHolder) {
+    public View getView(Activity activity, int width, int height, Drawable placeHolder) {
         return mView;
     }