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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-11 22:40:24 +00:00
committed by Android (Google) Code Review
parent 9b14a50805 c7621ff49e
commit b560ee3cfd
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}
}