Merge "Fixed an issue where the shade would jump" into oc-dev (1e2340da) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -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 {