diff options
| author | Wei Huang <weih@google.com> | 2012-06-19 11:25:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-19 11:25:37 -0700 |
| commit | cc6fb6fa68e3bf2e042a32cd1cbb1b30ddae875c (patch) | |
| tree | f063b644685f7a02891510655d8ecba3beca15e2 /src/com/android | |
| parent | 6a925de2b8f0e50cdc3006d156430952439cef8b (diff) | |
| parent | 99aedc6a630d4b8ca3dc586fa52c8b1f8d848824 (diff) | |
| download | android_packages_apps_Snap-cc6fb6fa68e3bf2e042a32cd1cbb1b30ddae875c.tar.gz android_packages_apps_Snap-cc6fb6fa68e3bf2e042a32cd1cbb1b30ddae875c.tar.bz2 android_packages_apps_Snap-cc6fb6fa68e3bf2e042a32cd1cbb1b30ddae875c.zip | |
am 885f729f: Merge "Make SystemUI always consists with the contrller overlay." into jb-dev
* commit '885f729fa16f9a25e688b23f1f9a94ab1bc591d5':
Make SystemUI always consists with the contrller overlay.
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/gallery3d/app/MoviePlayer.java | 11 | ||||
| -rw-r--r-- | src/com/android/gallery3d/app/TimeBar.java | 1 |
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()); |