Merge "Limit translation of bottom panel snapping to not overshoot." into cw-f-dev

This commit is contained in:
TreeHugger Robot
2016-09-15 22:23:16 +00:00
committed by Android (Google) Code Review

View File

@@ -306,8 +306,9 @@ public class WatchListDecorLayout extends FrameLayout
if (mListView.getChildCount() > 0) { if (mListView.getChildCount() > 0) {
if (mListView.getLastVisiblePosition() >= mListView.getCount() - 1) { if (mListView.getLastVisiblePosition() >= mListView.getCount() - 1) {
View lastChild = mListView.getChildAt(mListView.getChildCount() - 1); View lastChild = mListView.getChildAt(mListView.getChildCount() - 1);
setScrolling(mBottomPanel, setScrolling(mBottomPanel, Math.max(
lastChild.getY() + lastChild.getHeight() - mBottomPanel.getTop()); 0,
lastChild.getY() + lastChild.getHeight() - mBottomPanel.getTop()));
} else { } else {
// shift to hide the frame, last child is not the last position // shift to hide the frame, last child is not the last position
setScrolling(mBottomPanel, mBottomPanel.getHeight()); setScrolling(mBottomPanel, mBottomPanel.getHeight());