Merge "Dejank QS edit screen." into pi-dev am: 61b93505ba (947f5d8b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/customize/CustomizeTileView.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -44,4 +44,9 @@ public class CustomizeTileView extends QSTileView {
		public TextView getAppLabel() {
		return mSecondLine;
		}

		@Override
		protected boolean animationsEnabled() {
		return false;
		}
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -159,13 +159,13 @@ public class QSIconViewImpl extends QSIconView {
		return getColorForState(getContext(), state);
		}

		public static void animateGrayScale(int fromColor, int toColor, ImageView iv,
		private void animateGrayScale(int fromColor, int toColor, ImageView iv,
		final Runnable endRunnable) {
		if (iv instanceof AlphaControlledSlashImageView) {
		((AlphaControlledSlashImageView)iv)
		.setFinalImageTintList(ColorStateList.valueOf(toColor));
		}
		if (ValueAnimator.areAnimatorsEnabled()) {
		if (mAnimationEnabled && ValueAnimator.areAnimatorsEnabled()) {
		final float fromAlpha = Color.alpha(fromColor);
		final float toAlpha = Color.alpha(toColor);
		final float fromChannel = Color.red(fromColor);

+5 −1

Original line number	Diff line number	Diff line
		@@ -179,7 +179,7 @@ public class QSTileBaseView extends com.android.systemui.plugins.qs.QSTileView {
		protected void handleStateChanged(QSTile.State state) {
		int circleColor = getCircleColor(state.state);
		if (circleColor != mCircleColor) {
		if (mBg.isShown()) {
		if (mBg.isShown() && animationsEnabled()) {
		ValueAnimator animator = ValueAnimator.ofArgb(mCircleColor, circleColor)
		.setDuration(QS_ANIM_LENGTH);
		animator.addUpdateListener(animation -> mBg.setImageTintList(ColorStateList.valueOf(
		@@ -205,6 +205,10 @@ public class QSTileBaseView extends com.android.systemui.plugins.qs.QSTileView {
		}
		}

		protected boolean animationsEnabled() {
		return true;
		}

		private int getCircleColor(int state) {
		switch (state) {
		case Tile.STATE_ACTIVE: