Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev (048cabdb) · Commits · e / os / android_frameworks_base

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

+3 −18

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,6 @@ public abstract class ExpandableView extends FrameLayout {
	protected int mClipTopAmount;		protected int mClipTopAmount;
	private boolean mDark;		private boolean mDark;
	private ArrayList<View> mMatchParentViews = new ArrayList<View>();		private ArrayList<View> mMatchParentViews = new ArrayList<View>();
	private int mClipTopOptimization;
	private static Rect mClipRect = new Rect();		private static Rect mClipRect = new Rect();
	private boolean mWillBeGone;		private boolean mWillBeGone;
	private int mMinClipTopAmount = 0;		private int mMinClipTopAmount = 0;
	@@ -218,6 +217,7 @@ public abstract class ExpandableView extends FrameLayout {
	*/		*/
	public void setClipTopAmount(int clipTopAmount) {		public void setClipTopAmount(int clipTopAmount) {
	mClipTopAmount = clipTopAmount;		mClipTopAmount = clipTopAmount;
			updateClipping();
	}		}

	public int getClipTopAmount() {		public int getClipTopAmount() {
	@@ -306,7 +306,7 @@ public abstract class ExpandableView extends FrameLayout {
	public void getBoundsOnScreen(Rect outRect, boolean clipToParent) {		public void getBoundsOnScreen(Rect outRect, boolean clipToParent) {
	super.getBoundsOnScreen(outRect, clipToParent);		super.getBoundsOnScreen(outRect, clipToParent);
	outRect.bottom = outRect.top + getActualHeight();		outRect.bottom = outRect.top + getActualHeight();
	outRect.top += getClipTopOptimization();		outRect.top += getClipTopAmount();
	}		}

	public boolean isSummaryWithChildren() {		public boolean isSummaryWithChildren() {
	@@ -319,7 +319,7 @@ public abstract class ExpandableView extends FrameLayout {

	private void updateClipping() {		private void updateClipping() {
	if (mClipToActualHeight) {		if (mClipToActualHeight) {
	int top = mClipTopOptimization;		int top = getClipTopAmount();
	if (top >= getActualHeight()) {		if (top >= getActualHeight()) {
	top = getActualHeight() - 1;		top = getActualHeight() - 1;
	}		}
	@@ -335,21 +335,6 @@ public abstract class ExpandableView extends FrameLayout {
	updateClipping();		updateClipping();
	}		}

	public int getClipTopOptimization() {
	return mClipTopOptimization;
	}

	/**
	* Set that the view will be clipped by a given amount from the top. Contrary to
	* {@link #setClipTopAmount} this amount doesn't effect shadows and the background.
	*
	* @param clipTopOptimization the amount to clip from the top
	*/
	public void setClipTopOptimization(int clipTopOptimization) {
	mClipTopOptimization = clipTopOptimization;
	updateClipping();
	}

	public boolean willBeGone() {		public boolean willBeGone() {
	return mWillBeGone;		return mWillBeGone;
	}		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -430,7 +430,6 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged

	private boolean isGroupNotFullyVisible(NotificationGroup notificationGroup) {		private boolean isGroupNotFullyVisible(NotificationGroup notificationGroup) {
	return notificationGroup.summary == null		return notificationGroup.summary == null
	\|\| notificationGroup.summary.row.getClipTopOptimization() > 0
	\|\| notificationGroup.summary.row.getClipTopAmount() > 0		\|\| notificationGroup.summary.row.getClipTopAmount() > 0
	\|\| notificationGroup.summary.row.getTranslationY() < 0;		\|\| notificationGroup.summary.row.getTranslationY() < 0;
	}		}

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

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -393,7 +393,6 @@ public class NotificationChildrenContainer extends ViewGroup {
	childState.hideSensitive = parentState.hideSensitive;		childState.hideSensitive = parentState.hideSensitive;
	childState.belowSpeedBump = parentState.belowSpeedBump;		childState.belowSpeedBump = parentState.belowSpeedBump;
	childState.clipTopAmount = 0;		childState.clipTopAmount = 0;
	childState.topOverLap = 0;
	childState.alpha = 0;		childState.alpha = 0;
	if (i < firstOverflowIndex) {		if (i < firstOverflowIndex) {
	childState.alpha = 1;		childState.alpha = 1;

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

+1 −15

Original line number	Original line	Diff line number	Diff line
	@@ -2214,7 +2214,7 @@ public class NotificationStackScrollLayout extends ViewGroup
	updateAnimationState(false, child);		updateAnimationState(false, child);

	// Make sure the clipRect we might have set is removed		// Make sure the clipRect we might have set is removed
	expandableView.setClipTopOptimization(0);		expandableView.setClipTopAmount(0);
	}		}

	private boolean isChildInGroup(View child) {		private boolean isChildInGroup(View child) {
	@@ -3398,9 +3398,6 @@ public class NotificationStackScrollLayout extends ViewGroup
	public void setDismissAllInProgress(boolean dismissAllInProgress) {		public void setDismissAllInProgress(boolean dismissAllInProgress) {
	mDismissAllInProgress = dismissAllInProgress;		mDismissAllInProgress = dismissAllInProgress;
	mAmbientState.setDismissAllInProgress(dismissAllInProgress);		mAmbientState.setDismissAllInProgress(dismissAllInProgress);
	if (dismissAllInProgress) {
	disableClipOptimization();
	}
	handleDismissAllClipping();		handleDismissAllClipping();
	}		}

	@@ -3421,17 +3418,6 @@ public class NotificationStackScrollLayout extends ViewGroup
	}		}
	}		}

	private void disableClipOptimization() {
	final int count = getChildCount();
	for (int i = 0; i < count; i++) {
	ExpandableView child = (ExpandableView) getChildAt(i);
	if (child.getVisibility() == GONE) {
	continue;
	}
	child.setClipTopOptimization(0);
	}
	}

	public boolean isDismissViewNotGone() {		public boolean isDismissViewNotGone() {
	return mDismissView.getVisibility() != View.GONE && !mDismissView.willBeGone();		return mDismissView.getVisibility() != View.GONE && !mDismissView.willBeGone();
	}		}

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

+7 −49

Original line number	Original line	Diff line number	Diff line
	@@ -138,11 +138,9 @@ public class StackScrollAlgorithm {

	private void updateClipping(StackScrollState resultState,		private void updateClipping(StackScrollState resultState,
	StackScrollAlgorithmState algorithmState, AmbientState ambientState) {		StackScrollAlgorithmState algorithmState, AmbientState ambientState) {
	boolean dismissAllInProgress = ambientState.isDismissAllInProgress();
	float drawStart = ambientState.getTopPadding() + ambientState.getStackTranslation();		float drawStart = ambientState.getTopPadding() + ambientState.getStackTranslation();
	float previousNotificationEnd = 0;		float previousNotificationEnd = 0;
	float previousNotificationStart = 0;		float previousNotificationStart = 0;
	boolean previousNotificationIsSwiped = false;
	int childCount = algorithmState.visibleChildren.size();		int childCount = algorithmState.visibleChildren.size();
	for (int i = 0; i < childCount; i++) {		for (int i = 0; i < childCount; i++) {
	ExpandableView child = algorithmState.visibleChildren.get(i);		ExpandableView child = algorithmState.visibleChildren.get(i);
	@@ -153,36 +151,21 @@ public class StackScrollAlgorithm {
	}		}
	float newYTranslation = state.yTranslation;		float newYTranslation = state.yTranslation;
	float newHeight = state.height;		float newHeight = state.height;
	// apply clipping and shadow
	float newNotificationEnd = newYTranslation + newHeight;		float newNotificationEnd = newYTranslation + newHeight;

	float clipHeight;		if (newYTranslation < previousNotificationEnd) {
	if (previousNotificationIsSwiped) {		// The previous view is overlapping on top, clip!
	// When the previous notification is swiped, we don't clip the content to the		float overlapAmount = previousNotificationEnd - newYTranslation;
	// bottom of it.		state.clipTopAmount = (int) overlapAmount;
	clipHeight = newHeight;
	} else {		} else {
	clipHeight = newNotificationEnd - previousNotificationEnd;		state.clipTopAmount = 0;
	clipHeight = Math.max(0.0f, clipHeight);
	}

	updateChildClippingAndBackground(state, newHeight, clipHeight,
	newHeight - (previousNotificationStart - newYTranslation));

	if (dismissAllInProgress) {
	state.clipTopAmount = Math.max(child.getMinClipTopAmount(), state.clipTopAmount);
	}		}

	if (!child.isTransparent()) {		if (!child.isTransparent()) {
	// Only update the previous values if we are not transparent,		// Only update the previous values if we are not transparent,
	// otherwise we would clip to a transparent view.		// otherwise we would clip to a transparent view.
	if ((dismissAllInProgress && canChildBeDismissed(child))) {
	previousNotificationIsSwiped = true;
	} else {
	previousNotificationIsSwiped = ambientState.getDraggedViews().contains(child);
	previousNotificationEnd = newNotificationEnd;		previousNotificationEnd = newNotificationEnd;
	previousNotificationStart =newYTranslation + state.clipTopAmount;		previousNotificationStart = newYTranslation;
	}
	}		}
	}		}
	}		}
	@@ -192,31 +175,6 @@ public class StackScrollAlgorithm {
	return (veto != null && veto.getVisibility() != View.GONE);		return (veto != null && veto.getVisibility() != View.GONE);
	}		}

	/**
	* Updates the shadow outline and the clipping for a view.
	*
	* @param state the viewState to update
	* @param realHeight the currently applied height of the view
	* @param clipHeight the desired clip height, the rest of the view will be clipped from the top
	* @param backgroundHeight the desired background height. The shadows of the view will be
	* based on this height and the content will be clipped from the top
	*/
	private void updateChildClippingAndBackground(StackViewState state, float realHeight,
	float clipHeight, float backgroundHeight) {
	if (realHeight > clipHeight) {
	// Rather overlap than create a hole.
	state.topOverLap = (int) Math.floor(realHeight - clipHeight);
	} else {
	state.topOverLap = 0;
	}
	if (realHeight > backgroundHeight) {
	// Rather overlap than create a hole.
	state.clipTopAmount = (int) Math.floor(realHeight - backgroundHeight);
	} else {
	state.clipTopAmount = 0;
	}
	}

	/**		/**
	* Updates the dimmed, activated and hiding sensitive states of the children.		* Updates the dimmed, activated and hiding sensitive states of the children.
	*/		*/