Merge "FloatingActionMode: Avoid calling delayed code if view is inactive." (2e0a36c4) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/view/FloatingActionMode.java

+13 −4

Original line number	Diff line number	Diff line
		@@ -59,16 +59,20 @@ public class FloatingActionMode extends ActionMode {

		private final Runnable mMovingOff = new Runnable() {
		public void run() {
		if (isViewStillActive()) {
		mFloatingToolbarVisibilityHelper.setMoving(false);
		mFloatingToolbarVisibilityHelper.updateToolbarVisibility();
		}
		}
		};

		private final Runnable mHideOff = new Runnable() {
		public void run() {
		if (isViewStillActive()) {
		mFloatingToolbarVisibilityHelper.setHideRequested(false);
		mFloatingToolbarVisibilityHelper.updateToolbarVisibility();
		}
		}
		};

		private FloatingToolbar mFloatingToolbar;
		@@ -301,6 +305,11 @@ public class FloatingActionMode extends ActionMode {
		mOriginatingView.removeCallbacks(mHideOff);
		}

		private boolean isViewStillActive() {
		return mOriginatingView.getWindowVisibility() == View.VISIBLE
		&& mOriginatingView.isShown();
		}

		/**
		* A helper for showing/hiding the floating toolbar depending on certain states.
		*/