Merge "Fixed a bug where not enough notifications were shown on lockscreen" (7b36ce17) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1323,9 +1323,9 @@ public abstract class BaseStatusBar extends SystemUI implements
		}

		/**
		* Called when the panel was layouted expanded for the first time after being collapsed.
		* Called when the size of the notification panel changes
		*/
		public void onPanelExpandedAndLayouted() {
		public void onPanelHeightChanged() {
		if (mState == StatusBarState.KEYGUARD) {
		// Since the number of notifications is determined based on the height of the view, we
		// need to update them.

+5 −1

Original line number	Diff line number	Diff line
		@@ -82,6 +82,7 @@ public abstract class PanelView extends FrameLayout {
		private boolean mMotionAborted;
		private boolean mUpwardsWhenTresholdReached;
		private boolean mAnimatingOnDown;
		private int mLayoutHeight = 0;

		private ValueAnimator mHeightAnimator;
		private ObjectAnimator mPeekAnimator;
		@@ -716,6 +717,10 @@ public abstract class PanelView extends FrameLayout {
		@Override
		protected void onLayout (boolean changed, int left, int top, int right, int bottom) {
		super.onLayout(changed, left, top, right, bottom);
		if (mLayoutHeight != getHeight()) {
		mLayoutHeight = getHeight();
		mStatusBar.onPanelHeightChanged();
		}
		requestPanelHeightUpdate();
		mHasLayoutedSinceDown = true;
		if (mUpdateFlingOnLayout) {
		@@ -889,7 +894,6 @@ public abstract class PanelView extends FrameLayout {
		if (mStatusBar.getStatusBarWindow().getHeight()
		!= mStatusBar.getStatusBarHeight()) {
		getViewTreeObserver().removeOnGlobalLayoutListener(this);
		mStatusBar.onPanelExpandedAndLayouted();
		if (animate) {
		mBar.startOpeningPanel(PanelView.this);
		notifyExpandingStarted();