diff options
author | Ray Chen <raychen@google.com> | 2012-05-17 12:29:12 +0800 |
---|---|---|
committer | Hung-ying Tyan <tyanh@google.com> | 2012-05-23 12:41:50 +0800 |
commit | 0b920dba5d7452132f51c322e4a8282a1f73aac0 (patch) | |
tree | 2c85b2064cbf869e59efe0e19481e09fb04255b8 /src/com/android/gallery3d/data/MtpDeviceSet.java | |
parent | 048ca675a9e659fb0d3b150880d71cd42770023d (diff) | |
download | android_packages_apps_Snap-0b920dba5d7452132f51c322e4a8282a1f73aac0.tar.gz android_packages_apps_Snap-0b920dba5d7452132f51c322e4a8282a1f73aac0.tar.bz2 android_packages_apps_Snap-0b920dba5d7452132f51c322e4a8282a1f73aac0.zip |
Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos
And removed sync error toast.
Bug: 6259517
Change-Id: Ib7b25176a6db290220661a2e98e4e031043201d9
Diffstat (limited to 'src/com/android/gallery3d/data/MtpDeviceSet.java')
-rw-r--r-- | src/com/android/gallery3d/data/MtpDeviceSet.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/data/MtpDeviceSet.java b/src/com/android/gallery3d/data/MtpDeviceSet.java index 6dcb0d2e6..1f26511fc 100644 --- a/src/com/android/gallery3d/data/MtpDeviceSet.java +++ b/src/com/android/gallery3d/data/MtpDeviceSet.java @@ -47,6 +47,7 @@ public class MtpDeviceSet extends MediaSet private Future<ArrayList<MediaSet>> mLoadTask; private ArrayList<MediaSet> mDeviceSet = new ArrayList<MediaSet>(); private ArrayList<MediaSet> mLoadBuffer; + private boolean mIsLoading; public MtpDeviceSet(Path path, GalleryApp application, MtpContext mtpContext) { super(path, nextVersionNumber()); @@ -113,9 +114,15 @@ public class MtpDeviceSet extends MediaSet } @Override + public synchronized boolean isLoading() { + return mIsLoading; + } + + @Override public synchronized long reload() { if (mNotifier.isDirty()) { if (mLoadTask != null) mLoadTask.cancel(); + mIsLoading = true; mLoadTask = mApplication.getThreadPool().submit(new DevicesLoader(), this); } if (mLoadBuffer != null) { @@ -133,6 +140,7 @@ public class MtpDeviceSet extends MediaSet public synchronized void onFutureDone(Future<ArrayList<MediaSet>> future) { if (future != mLoadTask) return; mLoadBuffer = future.get(); + mIsLoading = false; if (mLoadBuffer == null) mLoadBuffer = new ArrayList<MediaSet>(); mHandler.post(new Runnable() { |