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

Merge "Don't animate status icons when the container changes size" into qt-dev

Browse Source 
am: 58517b7bfa

Change-Id: I226c87374adda68ccf3572d070cfe72a26b98978
This commit is contained in:
Evan Laird
2019-05-22 10:06:02 -07:00
committed by android-build-merger
parent c15cc62723 58517b7bfa
commit a113a50883
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusIconContainer.java
View File

@@ -378,8 +378,18 @@ public class StatusIconContainer extends AlphaOptimizedLinearLayout {
public int visibleState = STATE_ICON; public int visibleState = STATE_ICON;
public boolean justAdded = true; public boolean justAdded = true;
// How far we are from the end of the view actually is the most relevant for animation
float distanceToViewEnd = -1;
@Override @Override
public void applyToView(View view) { public void applyToView(View view) {
float parentWidth = 0;
if (view.getParent() instanceof View) {
parentWidth = ((View) view.getParent()).getWidth();
}
float currentDistanceToEnd = parentWidth - xTranslation;
if (!(view instanceof StatusIconDisplayable)) { if (!(view instanceof StatusIconDisplayable)) {
return; return;
} }
@@ -403,7 +413,7 @@ public class StatusIconContainer extends AlphaOptimizedLinearLayout {
// all other transitions (to/from dot, etc) // all other transitions (to/from dot, etc)
animationProperties = ANIMATE_ALL_PROPERTIES; animationProperties = ANIMATE_ALL_PROPERTIES;
} }
} else if (visibleState != STATE_HIDDEN && xTranslation != view.getTranslationX()) { } else if (visibleState != STATE_HIDDEN && distanceToViewEnd != currentDistanceToEnd) {
// Visibility isn't changing, just animate position // Visibility isn't changing, just animate position
animationProperties = X_ANIMATION_PROPERTIES; animationProperties = X_ANIMATION_PROPERTIES;
} }
@@ -416,6 +426,8 @@ public class StatusIconContainer extends AlphaOptimizedLinearLayout {
} }
justAdded = false; justAdded = false;
distanceToViewEnd = currentDistanceToEnd;
} }
} }