Merge "Make SystemUI always consists with the contrller overlay." into jb-dev (885f729f) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/gallery3d/app/MoviePlayer.java

+1 −10

Original line number	Diff line number	Diff line
		@@ -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,13 +367,8 @@ 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);
		}
		}

		@Override
		public void onHidden() {

+1 −0

Original line number	Diff line number	Diff line
		@@ -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());