Merge "Fix customizer state" into rvc-dev (3aa99808) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QSDetailClipper.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -104,4 +104,13 @@ public class QSDetailClipper {
		public void showBackground() {
		mBackground.showSecondLayer();
		}

		/**
		* Cancels the animator if it's running.
		*/
		public void cancelAnimator() {
		if (mAnimator != null) {
		mAnimator.cancel();
		}
		}
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -208,6 +208,7 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene
		public void showImmediately() {
		if (!isShown) {
		setVisibility(VISIBLE);
		mClipper.cancelAnimator();
		mClipper.showBackground();
		isShown = true;
		setTileSpecs();
		@@ -230,6 +231,10 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene
		mUiEventLogger.log(QSEditEvent.QS_EDIT_CLOSED);
		isShown = false;
		mToolbar.dismissPopupMenus();
		mClipper.cancelAnimator();
		// Make sure we're not opening (because we're closing). Nobody can think we are
		// customizing after the next two lines.
		mOpening = false;
		setCustomizing(false);
		save();
		if (animate) {