diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-09-09 14:42:43 -0700 |
|---|---|---|
| committer | Sascha Haeberling <haeberling@google.com> | 2013-09-09 15:58:21 -0700 |
| commit | b7639c641f2ed5d0c60546349c3aa9e90c026878 (patch) | |
| tree | d6b2b70ab0f099fd338168233a93fcfd314311ac /src/com/android/camera/data/LocalData.java | |
| parent | 08d82bae967db1cc090ab763f072e0410eb4b05e (diff) | |
| download | android_packages_apps_Snap-b7639c641f2ed5d0c60546349c3aa9e90c026878.tar.gz android_packages_apps_Snap-b7639c641f2ed5d0c60546349c3aa9e90c026878.tar.bz2 android_packages_apps_Snap-b7639c641f2ed5d0c60546349c3aa9e90c026878.zip | |
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
Diffstat (limited to 'src/com/android/camera/data/LocalData.java')
| -rw-r--r-- | src/com/android/camera/data/LocalData.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 |