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

Commit 64d1e902 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ia1d30608,I5ae681f7 into main 

* changes:
  Don't update visual stability when lockscreen hasn't changed
  Don't collect lockscreen transition value with Flexi off
parents e49f5aba e26ed7e0

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinator.java

+10 −3
Original line number Diff line number Diff line
@@ -143,9 +143,12 @@ public class VisualStabilityCoordinator implements Coordinator, Dumpable { 
                this::onLaunchingActivityChanged);

        mJavaAdapter.alwaysCollectFlow(mCommunalInteractor.isIdleOnCommunal(),

                this::onCommunalShowingChanged);



        if (SceneContainerFlag.isEnabled()) {

            mJavaAdapter.alwaysCollectFlow(mKeyguardTransitionInteractor.transitionValue(

                            KeyguardState.LOCKSCREEN),

                    this::onLockscreenKeyguardStateTransitionValueChanged);

        }



        pipeline.setVisualStabilityManager(mNotifStabilityManager);

    }
@@ -381,6 +384,10 @@ public class VisualStabilityCoordinator implements Coordinator, Dumpable { 
        }



        final boolean isShowing = value > 0.0f;

        if (isShowing == mLockscreenShowing) {

            return;

        }



        mLockscreenShowing = isShowing;

        updateAllowedStates("lockscreenShowing", isShowing);

    }