Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Dejank QS edit screen." into pi-dev

Browse Source 
am: 61b93505ba

Change-Id: Idd9b8e95f38f9e92211b2e8796add48d3383e4b5
This commit is contained in:
Amin Shaikh
2018-04-03 16:03:13 -07:00
committed by android-build-merger
parent 836554fb4b 61b93505ba
commit 6d49b45a0d
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,4 +44,9 @@ public class CustomizeTileView extends QSTileView {
public TextView getAppLabel() {
return mSecondLine;
}
@Override
protected boolean animationsEnabled() {
return false;
}
}

6
packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSIconViewImpl.java
View File

@@ -159,13 +159,13 @@ public class QSIconViewImpl extends QSIconView {
return getColorForState(getContext(), state);
}
public static void animateGrayScale(int fromColor, int toColor, ImageView iv,
final Runnable endRunnable) {
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);

6
packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileBaseView.java
View File

@@ -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: