diff options
| author | ztenghui <ztenghui@google.com> | 2013-11-12 18:12:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-12 18:12:34 +0000 |
| commit | aae09fb1ab292932504233da4be5181ce74db763 (patch) | |
| tree | af054318136bf47e72df51c29cc318bdb0144f22 /src/com | |
| parent | baffb73ca83d9d81c379f9f3b9f46cdac7355a0d (diff) | |
| parent | 8e64647afd70d6306ab638e25f47623c85b5fac0 (diff) | |
| download | android_packages_apps_Snap-aae09fb1ab292932504233da4be5181ce74db763.tar.gz android_packages_apps_Snap-aae09fb1ab292932504233da4be5181ce74db763.tar.bz2 android_packages_apps_Snap-aae09fb1ab292932504233da4be5181ce74db763.zip | |
Merge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos-carlsbad
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/data/CameraDataAdapter.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/camera/data/CameraDataAdapter.java b/src/com/android/camera/data/CameraDataAdapter.java index f59b2099c..99bde4181 100644 --- a/src/com/android/camera/data/CameraDataAdapter.java +++ b/src/com/android/camera/data/CameraDataAdapter.java @@ -28,6 +28,7 @@ import android.util.Log; import android.view.View; import com.android.camera.Storage; +import com.android.camera.app.PlaceholderManager; import com.android.camera.ui.FilmStripView.ImageData; import java.util.ArrayList; @@ -285,7 +286,11 @@ public class CameraDataAdapter implements LocalDataAdapter { while (true) { LocalData data = LocalMediaData.PhotoData.buildFromCursor(c); if (data != null) { - l.add(data); + if (data.getMimeType().equals(PlaceholderManager.PLACEHOLDER_MIME_TYPE)) { + l.add(new InProgressDataWrapper(data, true)); + } else { + l.add(data); + } } else { Log.e(TAG, "Error loading data:" + c.getString(LocalMediaData.PhotoData.COL_DATA)); |