From c7621ff49ef25673b80363fa66c14f35cd026c5f Mon Sep 17 00:00:00 2001 From: Evan Laird Date: Mon, 10 May 2021 17:45:52 -0400 Subject: [PATCH] Add check for the new animation scheduler state Previously the animation scheduler was IDLE while not animating and while showing the dot. Recently SHOWING_PERSISTENT_DOT was added and that needs to be checked. Test: manual Fixes: 187608678 Change-Id: I9eeb94a12878923b73920d2b3fc85cef7e7d28f9 --- .../systemui/statusbar/phone/CollapsedStatusBarFragment.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java index 2b51b56062bbc..b9fe9c4a57105 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java @@ -23,6 +23,7 @@ import static android.app.StatusBarManager.DISABLE_SYSTEM_INFO; import static com.android.systemui.statusbar.events.SystemStatusAnimationSchedulerKt.ANIMATING_IN; import static com.android.systemui.statusbar.events.SystemStatusAnimationSchedulerKt.ANIMATING_OUT; import static com.android.systemui.statusbar.events.SystemStatusAnimationSchedulerKt.IDLE; +import static com.android.systemui.statusbar.events.SystemStatusAnimationSchedulerKt.SHOWING_PERSISTENT_DOT; import android.animation.ValueAnimator; import android.annotation.Nullable; @@ -348,7 +349,8 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue private void showSystemIconArea(boolean animate) { // Only show the system icon area if we are not currently animating - if (mAnimationScheduler.getAnimationState() == IDLE) { + int state = mAnimationScheduler.getAnimationState(); + if (state == IDLE || state == SHOWING_PERSISTENT_DOT) { animateShow(mSystemIconArea, animate); } }