diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java | 9 |
1 files changed, 7 insertions, 2 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 e757148032e5..925ebf30cf7b 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 @@ -789,7 +789,6 @@ public class NotificationStackScrollLayout private void onJustBeforeDraw() { if (SceneContainerFlag.isEnabled()) { if (mChildrenUpdateRequested) { - updateForcedScroll(); updateChildren(); mChildrenUpdateRequested = false; } @@ -1998,7 +1997,8 @@ public class NotificationStackScrollLayout } public void lockScrollTo(View v) { - if (mForcedScroll == v) { + // NSSL shouldn't handle scrolling with SceneContainer enabled. + if (mForcedScroll == v || SceneContainerFlag.isEnabled()) { return; } mForcedScroll = v; @@ -2006,6 +2006,10 @@ public class NotificationStackScrollLayout } public boolean scrollTo(View v) { + // NSSL shouldn't handle scrolling with SceneContainer enabled. + if (SceneContainerFlag.isEnabled()) { + return false; + } ExpandableView expandableView = (ExpandableView) v; int positionInLinearLayout = getPositionInLinearLayout(v); int targetScroll = targetScrollForView(expandableView, positionInLinearLayout); @@ -2027,6 +2031,7 @@ public class NotificationStackScrollLayout * the IME. */ private int targetScrollForView(ExpandableView v, int positionInLinearLayout) { + SceneContainerFlag.assertInLegacyMode(); return positionInLinearLayout + v.getIntrinsicHeight() + getImeInset() - getHeight() + ((!isExpanded() && isPinnedHeadsUp(v)) ? mHeadsUpInset : getTopPadding()); |