Merge "Remove char state cache." into tm-qpr-dev (4300a958) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/PasswordTextView.java

+1 −28

Original line number	Diff line number	Diff line
		@@ -47,7 +47,6 @@ import com.android.settingslib.Utils;
		import com.android.systemui.R;

		import java.util.ArrayList;
		import java.util.Stack;

		/**
		* A View similar to a textView which contains password text and can animate when the text is
		@@ -92,7 +91,6 @@ public class PasswordTextView extends View {
		private final int mGravity;
		private ArrayList<CharState> mTextChars = new ArrayList<>();
		private String mText = "";
		private Stack<CharState> mCharPool = new Stack<>();
		private int mDotSize;
		private PowerManager mPM;
		private int mCharPadding;
		@@ -310,13 +308,7 @@ public class PasswordTextView extends View {
		}

		private CharState obtainCharState(char c) {
		CharState charState;
		if(mCharPool.isEmpty()) {
		charState = new CharState();
		} else {
		charState = mCharPool.pop();
		charState.reset();
		}
		CharState charState = new CharState();
		charState.whichChar = c;
		return charState;
		}
		@@ -343,8 +335,6 @@ public class PasswordTextView extends View {
		maxDelay = Math.min(maxDelay, RESET_MAX_DELAY) + DISAPPEAR_DURATION;
		charState.startRemoveAnimation(startDelay, maxDelay);
		charState.removeDotSwapCallbacks();
		} else {
		mCharPool.push(charState);
		}
		}
		if (!animated) {
		@@ -421,8 +411,6 @@ public class PasswordTextView extends View {
		public void onAnimationEnd(Animator animation) {
		if (!mCancelled) {
		mTextChars.remove(CharState.this);
		mCharPool.push(CharState.this);
		reset();
		cancelAnimator(textTranslateAnimator);
		textTranslateAnimator = null;
		}
		@@ -518,21 +506,6 @@ public class PasswordTextView extends View {
		}
		};

		void reset() {
		whichChar = 0;
		currentTextSizeFactor = 0.0f;
		currentDotSizeFactor = 0.0f;
		currentWidthFactor = 0.0f;
		cancelAnimator(textAnimator);
		textAnimator = null;
		cancelAnimator(dotAnimator);
		dotAnimator = null;
		cancelAnimator(widthAnimator);
		widthAnimator = null;
		currentTextTranslationY = 1.0f;
		removeDotSwapCallbacks();
		}

		void startRemoveAnimation(long startDelay, long widthDelay) {
		boolean dotNeedsAnimation = (currentDotSizeFactor > 0.0f && dotAnimator == null)
		\|\| (dotAnimator != null && dotAnimationIsGrowing);