Merge "Fix issues with TrustDrawable" into lmp-mr1-dev (0b3036a5) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/TrustDrawable.java

+10 −7

Original line number	Diff line number	Diff line
		@@ -133,6 +133,7 @@ public class TrustDrawable extends Drawable {
		if (!mAnimating) {
		mAnimating = true;
		updateState(true);
		invalidateSelf();
		}
		}

		@@ -146,18 +147,21 @@ public class TrustDrawable extends Drawable {
		mState = STATE_UNSET;
		mCurAlpha = 0;
		mCurInnerRadius = mInnerRadiusEnter;
		invalidateSelf();
		}
		}

		public void setTrustManaged(boolean trustManaged) {
		if (trustManaged == mTrustManaged && mState != STATE_UNSET) return;
		mTrustManaged = trustManaged;
		if (mAnimating) {
		updateState(true);
		}

		private void updateState(boolean allowTransientState) {
		if (!mAnimating) {
		return;
		}

		private void updateState(boolean animate) {
		int nextState = mState;
		if (mState == STATE_UNSET) {
		nextState = mTrustManaged ? STATE_ENTERING : STATE_GONE;
		@@ -170,7 +174,7 @@ public class TrustDrawable extends Drawable {
		} else if (mState == STATE_EXITING) {
		if (mTrustManaged) nextState = STATE_ENTERING;
		}
		if (!animate) {
		if (!allowTransientState) {
		if (nextState == STATE_ENTERING) nextState = STATE_VISIBLE;
		if (nextState == STATE_EXITING) nextState = STATE_GONE;
		}
		@@ -200,9 +204,8 @@ public class TrustDrawable extends Drawable {
		mState = nextState;
		if (mCurAnimator != null) {
		mCurAnimator.start();
		} else {
		invalidateSelf();
		}
		invalidateSelf();
		}
		}