From 4581cf820637301dffa7dab0d59d92929b19e9c1 Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Tue, 12 Aug 2014 12:40:32 +0200 Subject: Fixed a jump in the stack scroller algorithm The bottom stack jumped slightly when scrolling in landscape. Bug: 16954513 Change-Id: I11ed9074cf5286b01f4f57ce37b4476c2ee9cd7e --- .../com/android/systemui/statusbar/stack/StackScrollAlgorithm.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'packages/SystemUI/src') diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java index 79a83db..f984339 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java @@ -385,11 +385,14 @@ public class StackScrollAlgorithm { // check if we are overlapping with the bottom stack if (childViewState.yTranslation + childHeight + mPaddingBetweenElements - >= bottomStackStart && !mIsExpansionChanging && i != 0) { + >= bottomStackStart && !mIsExpansionChanging && i != 0 && mIsSmallScreen) { // we just collapse this element slightly int newSize = (int) Math.max(bottomStackStart - mPaddingBetweenElements - childViewState.yTranslation, mCollapsedSize); childViewState.height = newSize; + updateStateForChildTransitioningInBottom(algorithmState, bottomStackStart, + bottomPeekStart, childViewState.yTranslation, childViewState, + childHeight); } clampPositionToBottomStackStart(childViewState, childViewState.height); } else if (nextYPosition >= bottomStackStart) { -- cgit v1.1