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

Merge "Fixed that an icon could become invisible"

Browse Source
This commit is contained in:
Selim Cinek
2017-02-15 21:17:54 +00:00
committed by Android (Google) Code Review
parent d7937b3488 5ece5a7c34
commit 74841fb59f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
View File

@@ -538,10 +538,13 @@ public class StatusBarIconView extends AnimatedImageView {
boolean runnableAdded = false;
if (visibleState != mVisibleState) {
mVisibleState = visibleState;
if (mIconAppearAnimator != null) {
mIconAppearAnimator.cancel();
}
if (mDotAnimator != null) {
mDotAnimator.cancel();
}
if (animate) {
if (mIconAppearAnimator != null) {
mIconAppearAnimator.cancel();
}
float targetAmount = 0.0f;
Interpolator interpolator = Interpolators.FAST_OUT_LINEAR_IN;
if (visibleState == STATE_ICON) {
@@ -565,9 +568,6 @@ public class StatusBarIconView extends AnimatedImageView {
runnableAdded = true;
}
if (mDotAnimator != null) {
mDotAnimator.cancel();
}
targetAmount = visibleState == STATE_ICON ? 2.0f : 0.0f;
interpolator = Interpolators.FAST_OUT_LINEAR_IN;
if (visibleState == STATE_DOT) {