summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-01-18 06:25:35 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-01-18 06:25:35 -0800
commit119c6106bd1ea71c64f47fc323e953a12890f53b (patch)
treea05100cd32acbd3b81436623ddf7ddd4c81a11b2 /src/com
parent39fa7186454d723b00e69ec58419198e51efcf31 (diff)
parentcd8518f500e7a4ddb6a32d4279aeefae35c058f4 (diff)
downloadandroid_packages_apps_Gallery2-119c6106bd1ea71c64f47fc323e953a12890f53b.tar.gz
android_packages_apps_Gallery2-119c6106bd1ea71c64f47fc323e953a12890f53b.tar.bz2
android_packages_apps_Gallery2-119c6106bd1ea71c64f47fc323e953a12890f53b.zip
Merge "Gallery2: Fix show the wrong UI after resume when the video stop."
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/gallery3d/app/MovieControllerOverlay.java13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/MovieControllerOverlay.java b/src/com/android/gallery3d/app/MovieControllerOverlay.java
index 168cbe102..de68a4579 100644
--- a/src/com/android/gallery3d/app/MovieControllerOverlay.java
+++ b/src/com/android/gallery3d/app/MovieControllerOverlay.java
@@ -559,7 +559,11 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements
mAlwaysShowBottom = alwaysShow;
if (!alwaysShow) { // clear background
setBackgroundDrawable(null);
- setBackgroundColor(Color.TRANSPARENT);
+ if (mState == State.PAUSED || mState == State.PLAYING) {
+ setBackgroundColor(Color.TRANSPARENT);
+ }else {
+ setBackgroundColor(Color.BLACK);
+ }
} else {
setBackgroundResource(R.drawable.media_default_bkg);
if (foreShow) {
@@ -875,8 +879,13 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements
}
public void onShow() {
- Log.v(TAG, "ControllerRewindAndForwardExt onShow");
+ Log.v(TAG, "ControllerRewindAndForwardExt onShow: "+mState);
mContollerButtons.setVisibility(View.VISIBLE);
+ if (mState == State.PAUSED || mState == State.PLAYING) {
+ setBackgroundColor(Color.TRANSPARENT);
+ } else {
+ setBackgroundColor(Color.BLACK);
+ }
}
public void onLayout(int l, int r, int b) {