Merge "Gallery2: Menu options list disappears very fast" (ddbaaa6e) · Commits · e / os / android_packages_apps_Gallery2

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.gallery3d.app;

		import android.annotation.TargetApi;
		import android.app.ActionBar;
		import android.app.ActionBar.OnMenuVisibilityListener;
		import android.app.Activity;
		import android.app.AlertDialog;
		import android.app.KeyguardManager;
		@@ -265,6 +266,18 @@ public class MovieActivity extends Activity {
		ActionBar.DISPLAY_HOME_AS_UP \| ActionBar.DISPLAY_SHOW_TITLE,
		ActionBar.DISPLAY_HOME_AS_UP \| ActionBar.DISPLAY_SHOW_TITLE);

		actionBar.addOnMenuVisibilityListener(new OnMenuVisibilityListener() {
		@Override
		public void onMenuVisibilityChanged(boolean isVisible) {
		if (mPlayer != null) {
		if (isVisible) {
		mPlayer.cancelHidingController();
		} else {
		mPlayer.restartHidingController();
		}
		}
		}
		});
		String title = intent.getStringExtra(Intent.EXTRA_TITLE);
		if (title != null) {
		actionBar.setTitle(title);

+2 −2

Original line number	Diff line number	Diff line
		@@ -196,7 +196,7 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements
		maybeStartHiding();
		}

		private void maybeStartHiding() {
		public void maybeStartHiding() {
		cancelHiding();
		if (mState == State.PLAYING) {
		handler.postDelayed(startHidingRunnable, 2500);
		@@ -221,7 +221,7 @@ public class MovieControllerOverlay extends CommonControllerOverlay implements
		}
		}

		private void cancelHiding() {
		public void cancelHiding() {
		handler.removeCallbacks(startHidingRunnable);
		if (mOverlayExt.canHidePanel()) {
		mBackground.setAnimation(null);

+12 −0

Original line number	Diff line number	Diff line
		@@ -1575,6 +1575,18 @@ public class MoviePlayer implements
		videoPlayerData, 0);
		return (mPrefs.getInt(slectedStepOption, stepOptionThreeSeconds) + 1) * stepBase;
		}

		public void restartHidingController() {
		if (mController != null) {
		mController.maybeStartHiding();
		}
		}

		public void cancelHidingController() {
		if (mController != null) {
		mController.cancelHiding();
		}
		}
		}

		class Bookmarker {