Merge "Fix fluctuating notification height during shade open" into sc-dev (51f0592f) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1142,7 +1142,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
	if (mQsExpansionFraction <= 0) {		if (mQsExpansionFraction <= 0) {
	final float scrimTopPadding = mAmbientState.isOnKeyguard() ? 0 : mSidePaddings;		final float scrimTopPadding = mAmbientState.isOnKeyguard() ? 0 : mSidePaddings;
	final float stackEndHeight = Math.max(0f,		final float stackEndHeight = Math.max(0f,
	getHeight() - getEmptyBottomMargin() - stackY);		getHeight() - getEmptyBottomMargin() - mTopPadding);
	mAmbientState.setStackEndHeight(stackEndHeight);		mAmbientState.setStackEndHeight(stackEndHeight);
	mAmbientState.setStackHeight(		mAmbientState.setStackHeight(
	MathUtils.lerp(stackEndHeight * StackScrollAlgorithm.START_FRACTION,		MathUtils.lerp(stackEndHeight * StackScrollAlgorithm.START_FRACTION,

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

+6 −7

Original line number	Original line	Diff line number	Diff line
	@@ -348,14 +348,14 @@ public class StackScrollAlgorithm {
	StackScrollAlgorithmState algorithmState,		StackScrollAlgorithmState algorithmState,
	AmbientState ambientState) {		AmbientState ambientState) {

	final boolean isShowingShelf = ambientState.getShelf() != null		final boolean showingShelf = ambientState.getShelf() != null
	&& algorithmState.firstViewInShelf != null;		&& algorithmState.firstViewInShelf != null;

	final float stackHeight = ambientState.getStackHeight()		final float shelfHeight = showingShelf ? ambientState.getShelf().getIntrinsicHeight() : 0f;
	- (isShowingShelf ? ambientState.getShelf().getIntrinsicHeight() : 0f);		final float scrimPadding = ambientState.isOnKeyguard() ? 0 : mNotificationScrimPadding;

	float stackEndHeight = ambientState.getStackEndHeight()		final float stackHeight = ambientState.getStackHeight() - shelfHeight - scrimPadding;
	- (isShowingShelf ? ambientState.getShelf().getIntrinsicHeight() : 0f);		final float stackEndHeight = ambientState.getStackEndHeight() - shelfHeight - scrimPadding;

	return stackHeight / stackEndHeight;		return stackHeight / stackEndHeight;
	}		}
	@@ -459,8 +459,7 @@ public class StackScrollAlgorithm {
	maxViewHeight = algorithmState.viewHeightBeforeShelf;		maxViewHeight = algorithmState.viewHeightBeforeShelf;
	}		}
	}		}
	viewState.height = (int) MathUtils.lerp(maxViewHeight * START_FRACTION, maxViewHeight,		viewState.height = (int) (maxViewHeight * expansionFraction);
	expansionFraction);
	}		}

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