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

Commit 713a9283 authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "[flexiglass] HACKY: fix animations in NSSL" into main

parents c22cba07 4125e10f

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+1 −0
Original line number Diff line number Diff line
@@ -3174,6 +3174,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
            }

            notifyExpandingFinished();

        }

        // TODO(b/332732878): replace this call when scene container is enabled

        mNotificationStackScrollLayoutController.setAnimationsEnabled(!disabled);

    }

packages/SystemUI/src/com/android/systemui/shade/ShadeSurfaceImpl.kt

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ class ShadeSurfaceImpl @Inject constructor() : ShadeSurface, ShadeViewController 
    }



    override fun setTouchAndAnimationDisabled(disabled: Boolean) {

        // TODO(b/322197941): determine if still needed

        // TODO(b/332732878): determine if still needed

    }



    override fun setWillPlayDelayedDozeAmountAnimation(willPlay: Boolean) {

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+3 −1
Original line number Diff line number Diff line
@@ -230,7 +230,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
    private final ArrayList<View> mSwipedOutViews = new ArrayList<>();

    private NotificationStackSizeCalculator mNotificationStackSizeCalculator;

    private final StackStateAnimator mStateAnimator;

    private boolean mAnimationsEnabled;

    // TODO(b/332732878): call setAnimationsEnabled with scene container enabled, then remove this

    private boolean mAnimationsEnabled = SceneContainerFlag.isEnabled();

    private boolean mChangePositionInProgress;

    private boolean mChildTransferInProgress;
@@ -2904,6 +2905,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
    }



    public void setAnimationsEnabled(boolean animationsEnabled) {

        // TODO(b/332732878): remove the initial value of this field once the setter is called

        mAnimationsEnabled = animationsEnabled;

        updateNotificationAnimationStates();

        if (!animationsEnabled) {