summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ioana Alexandru <aioana@google.com> 2024-08-30 19:26:04 +0200
committer Ioana Alexandru <aioana@google.com> 2024-09-02 16:41:45 +0000
commitecc1b58dc8fefeae3a5a9fa67c7721e13f94b0d4 (patch)
tree2dd9bd6152cacbe960ea1dac8fba0243296499ed
parent8755f8ea491357425183e19e7adafd29673539a2 (diff)
[flexiglass] Remove mScrollable usages
Scrolling in the NSSL is now handled in flexiglass, and this was for the most part replaced by scrollingEnabled. Bug: 360091533 Bug: 360106096 Test: manually tested that things look good when scrolling, including when a notification is pinned Flag: com.android.systemui.scene_container Change-Id: I11d4201f1064e18a998c27c001760be2400a02c7
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java6
1 files changed, 6 insertions, 0 deletions
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 925ebf30cf7b..407a06535556 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
@@ -2629,6 +2629,9 @@ public class NotificationStackScrollLayout
}
private void updateScrollability() {
+ if (SceneContainerFlag.isEnabled()) {
+ return;
+ }
boolean scrollable = !mQsFullScreen && getScrollRange() > 0;
if (scrollable != mScrollable) {
mScrollable = scrollable;
@@ -2638,6 +2641,7 @@ public class NotificationStackScrollLayout
}
private void updateForwardAndBackwardScrollability() {
+ SceneContainerFlag.assertInLegacyMode();
boolean forwardScrollable = mScrollable && !mScrollAdapter.isScrolledToBottom();
boolean backwardsScrollable = mScrollable && !mScrollAdapter.isScrolledToTop();
boolean changed = forwardScrollable != mForwardScrollable
@@ -5147,6 +5151,7 @@ public class NotificationStackScrollLayout
}
boolean isQsFullScreen() {
+ SceneContainerFlag.assertInLegacyMode();
return mQsFullScreen;
}
@@ -5194,6 +5199,7 @@ public class NotificationStackScrollLayout
}
private void updateOnScrollChange() {
+ SceneContainerFlag.assertInLegacyMode();
if (mScrollListener != null) {
mScrollListener.accept(mOwnScrollY);
}