summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLikai Ding <likaid@codeaurora.org>2014-04-30 10:51:53 +0800
committerLorDClockaN <davor@losinj.com>2014-09-04 21:56:45 +0200
commitabe93bf70efa4db7c1bb3dd40c269c17938908cf (patch)
treeae57c424dbc9c82a9a796632d2812ffbe8e05818
parente21d0b33019b1cf553e2513a7fdd2c68478311c6 (diff)
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 7c418a5e..3b9a1d62 100644
--- a/src/com/android/gallery3d/app/MoviePlayer.java
+++ b/src/com/android/gallery3d/app/MoviePlayer.java
@@ -490,15 +490,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();