summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLikai Ding <likaid@codeaurora.org>2014-04-30 10:51:53 +0800
committeremancebo <emancebo@cyngn.com>2014-09-04 10:40:21 -0700
commit4f8d14a26ee1f1945149ac9a7051eb22d28751ae (patch)
treee035f3c00ab2a1a8808336ace00b3407c00a7349
parent9e64956bbbe8c522737018cb96b8a360b11e8c4d (diff)
downloadandroid_packages_apps_Gallery2-4f8d14a26ee1f1945149ac9a7051eb22d28751ae.tar.gz
android_packages_apps_Gallery2-4f8d14a26ee1f1945149ac9a7051eb22d28751ae.tar.bz2
android_packages_apps_Gallery2-4f8d14a26ee1f1945149ac9a7051eb22d28751ae.zip
MoviePlayer: don't resume playing if there is pending dialog
In onResume(), mDelayVideoRunnable should be posted after dialog check. Change-Id: I3b7789090acb1a49803a66766883414768b59ac7
-rw-r--r--src/com/android/gallery3d/app/MoviePlayer.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java
index 2be1da30f..54f852448 100644
--- a/src/com/android/gallery3d/app/MoviePlayer.java
+++ b/src/com/android/gallery3d/app/MoviePlayer.java
@@ -482,15 +482,15 @@ public class MoviePlayer implements
public void onResume() {
mDragging = false;// clear drag info
if (mHasPaused) {
- //M: same as launch case to delay transparent.
- mVideoView.removeCallbacks(mDelayVideoRunnable);
- mVideoView.postDelayed(mDelayVideoRunnable, BLACK_TIMEOUT);
-
if (mServerTimeoutExt.handleOnResume() || mIsShowResumingDialog) {
mHasPaused = false;
mHandler.post(mProgressChecker);
return;
}
+
+ //M: same as launch case to delay transparent.
+ mVideoView.removeCallbacks(mDelayVideoRunnable);
+ mVideoView.postDelayed(mDelayVideoRunnable, BLACK_TIMEOUT);
switch (mTState) {
case RETRY_ERROR:
mRetryExt.showRetry();