summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2012-10-19 15:42:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-19 15:42:41 -0700
commitc5f764d30d87f4e3f61193df9df7f6c50b7f0ff3 (patch)
tree53e3660fdb28e8bf1bb0188c077ecdd676cefd26
parent3d5a42614f4e84234414cc9fac081ce4fc946c9b (diff)
parent63ec6cf86b5ff11bd4af50cf8422b64818ec9806 (diff)
downloadandroid_packages_apps_Snap-c5f764d30d87f4e3f61193df9df7f6c50b7f0ff3.tar.gz
android_packages_apps_Snap-c5f764d30d87f4e3f61193df9df7f6c50b7f0ff3.tar.bz2
android_packages_apps_Snap-c5f764d30d87f4e3f61193df9df7f6c50b7f0ff3.zip
am 4dd4d80a: Remove progress bar when switching to grid mode.
* commit '4dd4d80af4cd3ba7555c12d1c1ba775e048b6c57': Remove progress bar when switching to grid mode.
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index b526f91fe..5e3b166c3 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -966,6 +966,10 @@ public class PhotoPage extends ActivityState implements
onUpPressed();
} else {
if (mOriginalSetPathString == null) return;
+ if (mProgressBar != null) {
+ updateCurrentPhoto(null);
+ mProgressBar.hideProgress();
+ }
Bundle data = new Bundle(getData());
data.putString(AlbumPage.KEY_MEDIA_PATH, mOriginalSetPathString);
data.putString(AlbumPage.KEY_PARENT_MEDIA_PATH,