Merge "Appear notifications at min height instead of 0 height" into sc-dev (61b39c06) · Commits · e / os / android_frameworks_base

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

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1143,16 +1143,18 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
	*/		*/
	private void updateStackPosition() {		private void updateStackPosition() {
	// Consider interpolating from an mExpansionStartY for use on lockscreen and AOD		// Consider interpolating from an mExpansionStartY for use on lockscreen and AOD
	final float stackY = MathUtils.lerp(0, mTopPadding, mAmbientState.getExpansionFraction());		final float fraction = mAmbientState.getExpansionFraction();
			final float stackY = MathUtils.lerp(0, mTopPadding, fraction);
	mAmbientState.setStackY(stackY);		mAmbientState.setStackY(stackY);
	if (mOnStackYChanged != null) {		if (mOnStackYChanged != null) {
	mOnStackYChanged.run();		mOnStackYChanged.run();
	}		}

	final float shadeBottom = getHeight() - getEmptyBottomMargin();		final float stackEndHeight = getHeight() - getEmptyBottomMargin() - mTopPadding;
	mAmbientState.setStackEndHeight(shadeBottom - mTopPadding);		mAmbientState.setStackEndHeight(stackEndHeight);
	mAmbientState.setStackHeight(		mAmbientState.setStackHeight(
	MathUtils.lerp(0, shadeBottom - mTopPadding, mAmbientState.getExpansionFraction()));		MathUtils.lerp(stackEndHeight * StackScrollAlgorithm.START_FRACTION,
			stackEndHeight, fraction));
	}		}

	void setOnStackYChanged(Runnable onStackYChanged) {		void setOnStackYChanged(Runnable onStackYChanged) {

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -42,6 +42,8 @@ import java.util.List;
	*/		*/
	public class StackScrollAlgorithm {		public class StackScrollAlgorithm {

			public static final float START_FRACTION = 0.3f;

	private static final String LOG_TAG = "StackScrollAlgorithm";		private static final String LOG_TAG = "StackScrollAlgorithm";
	private final ViewGroup mHostView;		private final ViewGroup mHostView;

	@@ -442,7 +444,8 @@ public class StackScrollAlgorithm {
	maxViewHeight = algorithmState.viewHeightBeforeShelf;		maxViewHeight = algorithmState.viewHeightBeforeShelf;
	}		}
	}		}
	viewState.height = (int) MathUtils.lerp(0, maxViewHeight, expansionFraction);		viewState.height = (int) MathUtils.lerp(maxViewHeight * START_FRACTION, maxViewHeight,
			expansionFraction);
	}		}

	currentYPosition += viewState.height + expansionFraction * mPaddingBetweenElements;		currentYPosition += viewState.height + expansionFraction * mPaddingBetweenElements;