diff options
| author | Selim Cinek <cinek@google.com> | 2014-08-12 12:40:32 +0200 |
|---|---|---|
| committer | Selim Cinek <cinek@google.com> | 2014-08-12 10:50:55 +0000 |
| commit | 4581cf820637301dffa7dab0d59d92929b19e9c1 (patch) | |
| tree | 0d086066d539a9296916f0aa2f805623912ac71a /packages/SystemUI/src | |
| parent | e5910f70fcf99cb2d3bf391b585a236be417d3e6 (diff) | |
| download | frameworks_base-4581cf820637301dffa7dab0d59d92929b19e9c1.zip frameworks_base-4581cf820637301dffa7dab0d59d92929b19e9c1.tar.gz frameworks_base-4581cf820637301dffa7dab0d59d92929b19e9c1.tar.bz2 | |
Fixed a jump in the stack scroller algorithm
The bottom stack jumped slightly when scrolling in landscape.
Bug: 16954513
Change-Id: I11ed9074cf5286b01f4f57ce37b4476c2ee9cd7e
Diffstat (limited to 'packages/SystemUI/src')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java | 5 |
1 files changed, 4 insertions, 1 deletions
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) { |