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

Merge "Fixed an issue where the shade would jump" into oc-dev

Browse Source
This commit is contained in:
Selim Cinek
2017-06-01 17:44:53 +00:00
committed by Android (Google) Code Review
parent a7a39ea187 7cb49d6f40
commit 1e2340da3a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -815,7 +815,8 @@ public class NotificationStackScrollLayout extends ViewGroup
*/
private float getAppearEndPosition() {
int appearPosition;
if (mEmptyShadeView.getVisibility() == GONE) {
int notGoneChildCount = getNotGoneChildCount();
if (mEmptyShadeView.getVisibility() == GONE && notGoneChildCount != 0) {
int minNotificationsForShelf = 1;
if (mTrackingHeadsUp || mHeadsUpManager.hasPinnedHeadsUp()) {
appearPosition = mHeadsUpManager.getTopHeadsUpPinnedHeight();
@@ -823,7 +824,7 @@ public class NotificationStackScrollLayout extends ViewGroup
} else {
appearPosition = 0;
}
if (getNotGoneChildCount() >= minNotificationsForShelf) {
if (notGoneChildCount >= minNotificationsForShelf) {
appearPosition += mShelf.getIntrinsicHeight();
}
} else {