Merge "Fixed that an icon could become invisible" (74841fb5) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -538,10 +538,13 @@ public class StatusBarIconView extends AnimatedImageView {
		boolean runnableAdded = false;
		if (visibleState != mVisibleState) {
		mVisibleState = visibleState;
		if (animate) {
		if (mIconAppearAnimator != null) {
		mIconAppearAnimator.cancel();
		}
		if (mDotAnimator != null) {
		mDotAnimator.cancel();
		}
		if (animate) {
		float targetAmount = 0.0f;
		Interpolator interpolator = Interpolators.FAST_OUT_LINEAR_IN;
		if (visibleState == STATE_ICON) {
		@@ -565,9 +568,6 @@ public class StatusBarIconView extends AnimatedImageView {
		runnableAdded = true;
		}

		if (mDotAnimator != null) {
		mDotAnimator.cancel();
		}
		targetAmount = visibleState == STATE_ICON ? 2.0f : 0.0f;
		interpolator = Interpolators.FAST_OUT_LINEAR_IN;
		if (visibleState == STATE_DOT) {