am 382feb11: am 885f729f: Merge "Make SystemUI always consists with the contrller overlay." into jb-dev

* commit '382feb11b767600d6aed8ad97d08d9de7a8673e0':
  Make SystemUI always consists with the contrller overlay.

2 files changed, 2 insertions, 10 deletions

diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java
index 13a77f472..11b40bdf8 100644
--- a/src/com/android/gallery3d/app/MoviePlayer.java
+++ b/src/com/android/gallery3d/app/MoviePlayer.java
@@ -86,9 +86,6 @@ public class MoviePlayer implements
     // 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 @@ public class MoviePlayer implements
                 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 class MoviePlayer implements
     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 1f5bfd96b..1f3630622 100644
--- a/src/com/android/gallery3d/app/TimeBar.java
+++ b/src/com/android/gallery3d/app/TimeBar.java
@@ -255,6 +255,7 @@ public class TimeBar extends View {
             return true;
           }
           break;
+        case MotionEvent.ACTION_CANCEL:
         case MotionEvent.ACTION_UP:
           if (scrubbing) {
             listener.onScrubbingEnd(getScrubberTime());