summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-10-11 10:19:36 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-11 10:19:36 -0700
commit98cc24e5356e36053e82ffb3188b0b3e464a4b17 (patch)
tree8a33c4b68cafbe429abbb02fc1480fc77fe6cff0 /src/com/android/gallery3d
parent039533359d63574fa098e1076dfa4ce7c1d0b17d (diff)
parent44ee4e0a23c2b15c9377b190e27a8243c221a921 (diff)
downloadandroid_packages_apps_Snap-98cc24e5356e36053e82ffb3188b0b3e464a4b17.tar.gz
android_packages_apps_Snap-98cc24e5356e36053e82ffb3188b0b3e464a4b17.tar.bz2
android_packages_apps_Snap-98cc24e5356e36053e82ffb3188b0b3e464a4b17.zip
am bebc94be: Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches
* commit 'bebc94be08667b474587592169155e6cb9855e77': Fix size of peripheral items when first opening filmstrip
Diffstat (limited to 'src/com/android/gallery3d')
-rw-r--r--src/com/android/gallery3d/ui/PhotoView.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index 214d0e017..5978159e4 100644
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -1318,6 +1318,7 @@ public class PhotoView extends GLView {
public void resume() {
mTileView.prepareTextures();
+ mPositionController.skipToFinalPosition();
}
// move to the camera preview and show controls after resume