Merge "Make SystemUI always consists with the contrller overlay." into jb-dev
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java
index 13a77f4..11b40bd 100644
--- a/src/com/android/gallery3d/app/MoviePlayer.java
+++ b/src/com/android/gallery3d/app/MoviePlayer.java
@@ -86,9 +86,6 @@
// If the time bar is visible.
private boolean mShowing;
- // Control when system UI can be shown
- private boolean mAllowShowingSystemUI;
-
private final Runnable mPlayingChecker = new Runnable() {
@Override
public void run() {
@@ -162,7 +159,6 @@
mLastSystemUiVis = visibility;
if ((diff & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) != 0
&& (visibility & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0) {
- mAllowShowingSystemUI = true;
mController.show();
// We need to set the background to clear ghosting images
@@ -371,12 +367,7 @@
public void onShown() {
mShowing = true;
setProgress();
-
- // System UI is invisible by default until the flag is set by user interaction
- // See VideoView's onSystemUiVisibilityChange listener for details.
- if (mAllowShowingSystemUI) {
- showSystemUi(true);
- }
+ showSystemUi(true);
}
@Override
diff --git a/src/com/android/gallery3d/app/TimeBar.java b/src/com/android/gallery3d/app/TimeBar.java
index 1f5bfd9..1f36306 100644
--- a/src/com/android/gallery3d/app/TimeBar.java
+++ b/src/com/android/gallery3d/app/TimeBar.java
@@ -255,6 +255,7 @@
return true;
}
break;
+ case MotionEvent.ACTION_CANCEL:
case MotionEvent.ACTION_UP:
if (scrubbing) {
listener.onScrubbingEnd(getScrubberTime());