Fixed an issue where the shade would jump

When collapsing directly from the expanded quicksettings
the shade would jump when there were no notifications.

Test: manual
Merged-In: I9a85cd57e2f96970ad4ea78a8c679145b58d563a
Change-Id: I9a85cd57e2f96970ad4ea78a8c679145b58d563a
Fixes: 35996906
This commit is contained in:
Selim Cinek
2017-05-26 13:48:47 -07:00
parent 605351c56c
commit 7cb49d6f40

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 {