summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-10-31 15:12:57 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-31 15:12:58 -0700
commite8cd59bd5446556bfbb53cea49330388d51e5e0d (patch)
tree0ff53d9c94449ea66d8ae6ce9641a72978bd0a98 /src
parent3b308b8764bb7e43899a34de3ff4b04f93298250 (diff)
parente47ca16b3941204721a6a06fa5c4ce5400b97640 (diff)
downloadandroid_packages_apps_Snap-e8cd59bd5446556bfbb53cea49330388d51e5e0d.tar.gz
android_packages_apps_Snap-e8cd59bd5446556bfbb53cea49330388d51e5e0d.tar.bz2
android_packages_apps_Snap-e8cd59bd5446556bfbb53cea49330388d51e5e0d.zip
Merge "Fix jank on videoplayer auto-exit" into gb-ub-photos-bryce
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/app/CommonControllerOverlay.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/CommonControllerOverlay.java b/src/com/android/gallery3d/app/CommonControllerOverlay.java
index ab43dada5..089872fa5 100644
--- a/src/com/android/gallery3d/app/CommonControllerOverlay.java
+++ b/src/com/android/gallery3d/app/CommonControllerOverlay.java
@@ -154,7 +154,7 @@ public abstract class CommonControllerOverlay extends FrameLayout implements
@Override
public void showEnded() {
mState = State.ENDED;
- showMainView(mPlayPauseReplayView);
+ if (mCanReplay) showMainView(mPlayPauseReplayView);
}
@Override