diff options
3 files changed, 5 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 343f37744ce9..dcfd47b7b303 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -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); } diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeSurfaceImpl.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeSurfaceImpl.kt index adb29287e40e..ec4018c7d238 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeSurfaceImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeSurfaceImpl.kt @@ -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) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java index 3367dc427f43..6a7a5cd8f6c3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java @@ -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) { |