Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0449b2f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add check for the new animation scheduler state" into sc-dev am: b560ee3c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14489558

Change-Id: Id13c48affca01372cfe33497311e4a002b9fadb8
parents 4d1797f3 b560ee3c

packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java

+3 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }