diff options
author | ztenghui <ztenghui@google.com> | 2013-11-12 09:57:14 -0800 |
---|---|---|
committer | ztenghui <ztenghui@google.com> | 2013-11-12 09:57:14 -0800 |
commit | 8e64647afd70d6306ab638e25f47623c85b5fac0 (patch) | |
tree | 3c5d06f5e55406f77c634ae9b20df9c151c07980 /src | |
parent | 6a42c3ae157c4495db56541ef87f6ee56b5d10b3 (diff) | |
download | android_packages_apps_Snap-8e64647afd70d6306ab638e25f47623c85b5fac0.tar.gz android_packages_apps_Snap-8e64647afd70d6306ab638e25f47623c85b5fac0.tar.bz2 android_packages_apps_Snap-8e64647afd70d6306ab638e25f47623c85b5fac0.zip |
Differentiate the InProgressData from the normal PhotoData.
When we load from MediaStore, we should differentiate the data still in
progress, e.g. HDR+, which should show the progress bar and hide the action bar
items.
bug:11634500
bug:11598186
Change-Id: I8179d39747218c8768977d5b3ce71eadbdfb8b58
Diffstat (limited to 'src')
-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)); |