Merge "Fixed notification shelf not fully visible on lockscreen" into pi-dev (bb24c6b5) · Commits · e / os / android_frameworks_base

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -729,7 +729,7 @@ public class NotificationStackScrollLayout extends ViewGroup
		}

		private void updateAlgorithmLayoutMinHeight() {
		mAmbientState.setLayoutMinHeight(mQsExpanded && !onKeyguard() \|\| isHeadsUpTransition()
		mAmbientState.setLayoutMinHeight(mQsExpanded \|\| isHeadsUpTransition()
		? getLayoutMinHeight() : 0);
		}

		@@ -2453,7 +2453,6 @@ public class NotificationStackScrollLayout extends ViewGroup
		}
		int finalHeight = ExpandableViewState.getFinalActualHeight(lastView);
		int finalBottom = finalTranslationY + finalHeight - lastView.getClipBottomAmount();
		finalBottom = Math.min(finalBottom, getHeight());
		if (mAnimateNextBackgroundBottom
		\|\| mBottomAnimator == null && mCurrentBounds.bottom == finalBottom
		\|\| mBottomAnimator != null && mEndAnimationRect.bottom == finalBottom) {
		@@ -2462,7 +2461,6 @@ public class NotificationStackScrollLayout extends ViewGroup
		} else {
		bottom = (int) (lastView.getTranslationY() + lastView.getActualHeight()
		- lastView.getClipBottomAmount());
		bottom = Math.min(bottom, getHeight());
		}
		} else {
		top = mTopPadding;
		@@ -2475,7 +2473,7 @@ public class NotificationStackScrollLayout extends ViewGroup
		top = Math.max(0, top);
		}
		mBackgroundBounds.top = top;
		mBackgroundBounds.bottom = Math.min(getHeight(), Math.max(bottom, top));
		mBackgroundBounds.bottom = Math.max(bottom, top);
		}

		private ActivatableNotificationView getFirstPinnedHeadsUp() {