Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[automerger] Merge "Fixed an issue where the contentHeight was wrong" into pi-dev am: ed9df0d176 am: 5c2a056a83

Browse Source 
Change-Id: I501b10108f3f075b171ed0d97bc0ae1385e49a55
This commit is contained in:
Android Build Merger (Role)
2018-06-18 17:46:19 +00:00
parent fcfd26b689 5c2a056a83
commit a85187d93b
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
View File

@@ -2053,11 +2053,9 @@ public class NotificationStackScrollLayout extends ViewGroup
}
private int getScrollRange() {
int contentHeight = getContentHeight();
int scrollRange = Math.max(0, contentHeight - mMaxLayoutHeight);
int scrollRange = Math.max(0, mContentHeight - mMaxLayoutHeight);
int imeInset = getImeInset();
scrollRange += Math.min(imeInset, Math.max(0,
getContentHeight() - (getHeight() - imeInset)));
scrollRange += Math.min(imeInset, Math.max(0, mContentHeight - (getHeight() - imeInset)));
return scrollRange;
}
@@ -2158,10 +2156,6 @@ public class NotificationStackScrollLayout extends ViewGroup
return count;
}
public int getContentHeight() {
return mContentHeight;
}
private void updateContentHeight() {
int height = 0;
float previousPaddingRequest = mPaddingBetweenElements;
@@ -2225,7 +2219,11 @@ public class NotificationStackScrollLayout extends ViewGroup
}
}
mIntrinsicContentHeight = height;
mContentHeight = height + mTopPadding + mBottomMargin;
// We don't want to use the toppadding since that might be interpolated and we want
// to take the final value of the animation.
int topPadding = mAmbientState.isFullyDark() ? mDarkTopPadding : mRegularTopPadding;
mContentHeight = height + topPadding + mBottomMargin;
updateScrollability();
clampScrollPosition();
mAmbientState.setLayoutMaxHeight(mContentHeight);