Merge changes I3e8594f6,I2c6d40ee into rvc-dev am: 08327f1659 am: ae5b0f2974... (4535a847) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/people_strip.xml

+10 −2

Original line number	Diff line number	Diff line
		@@ -31,13 +31,16 @@
		android:layout_height="match_parent"
		android:layout_marginEnd="8dp"
		android:gravity="bottom"
		android:orientation="horizontal">
		android:orientation="horizontal"
		android:forceHasOverlappingRendering="false"
		android:clipChildren="false">

		<FrameLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:gravity="start\|center_vertical"
		android:layout_weight="1">
		android:layout_weight="1"
		android:forceHasOverlappingRendering="false">

		<TextView
		style="@style/TextAppearance.NotificationSectionHeaderButton"
		@@ -53,6 +56,7 @@
		android:layout_height="48dp"
		android:padding="8dp"
		android:scaleType="fitCenter"
		android:forceHasOverlappingRendering="false"
		/>

		<ImageView
		@@ -60,6 +64,7 @@
		android:layout_height="48dp"
		android:padding="8dp"
		android:scaleType="fitCenter"
		android:forceHasOverlappingRendering="false"
		/>

		<ImageView
		@@ -67,6 +72,7 @@
		android:layout_height="48dp"
		android:padding="8dp"
		android:scaleType="fitCenter"
		android:forceHasOverlappingRendering="false"
		/>

		<ImageView
		@@ -74,6 +80,7 @@
		android:layout_height="48dp"
		android:padding="8dp"
		android:scaleType="fitCenter"
		android:forceHasOverlappingRendering="false"
		/>

		<ImageView
		@@ -81,6 +88,7 @@
		android:layout_height="48dp"
		android:padding="8dp"
		android:scaleType="fitCenter"
		android:forceHasOverlappingRendering="false"
		/>

		</LinearLayout>

packages/SystemUI/res/layout/status_bar_notification_section_header.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,8 @@
		android:layout_gravity="bottom"
		android:gravity="center_vertical"
		android:orientation="horizontal"
		android:forceHasOverlappingRendering="false"
		android:clipChildren="false"
		>
		<include layout="@layout/status_bar_notification_section_header_contents"/>
		</LinearLayout>

packages/SystemUI/res/layout/status_bar_notification_section_header_contents.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		android:id="@+id/header_label"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:forceHasOverlappingRendering="false"
		android:text="@string/notification_section_header_gentle"
		/>

		@@ -41,5 +42,6 @@
		android:tint="?attr/wallpaperTextColor"
		android:tintMode="src_in"
		android:visibility="gone"
		android:forceHasOverlappingRendering="false"
		/>
		</merge>

packages/SystemUI/res/values/dimens.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -184,8 +184,8 @@
		<!-- Vertical translation of pulsing notification animations -->
		<dimen name="pulsing_notification_appear_translation">10dp</dimen>

		<!-- The amount the content shifts upwards when transforming into the icon -->
		<dimen name="notification_icon_transform_content_shift">32dp</dimen>
		<!-- The amount the content shifts upwards when transforming into the shelf -->
		<dimen name="shelf_transform_content_shift">32dp</dimen>

		<!-- The padding on the bottom of the notifications on the keyguard -->
		<dimen name="keyguard_indication_bottom_padding">12sp</dimen>

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

+134 −126

Original line number	Diff line number	Diff line
		@@ -273,47 +273,37 @@ public class NotificationShelf extends ActivatableNotificationView implements
		int backgroundTop = 0;
		int clipTopAmount = 0;
		float firstElementRoundness = 0.0f;
		ActivatableNotificationView previousRow = null;
		ActivatableNotificationView previousAnv = null;

		for (int i = 0; i < mHostLayout.getChildCount(); i++) {
		ExpandableView child = (ExpandableView) mHostLayout.getChildAt(i);

		if (!(child instanceof ActivatableNotificationView)
		\|\| child.getVisibility() == GONE \|\| child == this) {
		if (!child.needsClippingToShelf() \|\| child.getVisibility() == GONE) {
		continue;
		}

		ActivatableNotificationView row = (ActivatableNotificationView) child;
		float notificationClipEnd;
		boolean aboveShelf = ViewState.getFinalTranslationZ(row) > baseZHeight
		\|\| row.isPinned();
		boolean aboveShelf = ViewState.getFinalTranslationZ(child) > baseZHeight
		\|\| child.isPinned();
		boolean isLastChild = child == lastChild;
		float rowTranslationY = row.getTranslationY();
		float rowTranslationY = child.getTranslationY();
		if ((isLastChild && !child.isInShelf()) \|\| aboveShelf \|\| backgroundForceHidden) {
		notificationClipEnd = shelfStart + getIntrinsicHeight();
		} else {
		notificationClipEnd = shelfStart - mPaddingBetweenElements;
		float height = notificationClipEnd - rowTranslationY;
		if (!row.isBelowSpeedBump() && height <= getNotificationMergeSize()) {
		// We want the gap to close when we reached the minimum size and only shrink
		// before
		notificationClipEnd = Math.min(shelfStart,
		rowTranslationY + getNotificationMergeSize());
		}
		}
		int clipTop = updateNotificationClipHeight(row, notificationClipEnd, notGoneIndex);
		int clipTop = updateNotificationClipHeight(child, notificationClipEnd, notGoneIndex);
		clipTopAmount = Math.max(clipTop, clipTopAmount);


		float inShelfAmount = updateShelfTransformation(child, expandAmount, scrolling,
		scrollingFast, expandingAnimated, isLastChild);
		// If the current row is an ExpandableNotificationRow, update its color, roundedness,
		// and icon state.
		if (row instanceof ExpandableNotificationRow) {
		ExpandableNotificationRow expandableRow = (ExpandableNotificationRow) row;

		float inShelfAmount = updateIconAppearance(expandableRow, expandAmount, scrolling,
		scrollingFast,
		expandingAnimated, isLastChild);
		if (child instanceof ExpandableNotificationRow) {
		ExpandableNotificationRow expandableRow = (ExpandableNotificationRow) child;
		numViewsInShelf += inShelfAmount;
		int ownColorUntinted = row.getBackgroundColorWithoutTint();
		int ownColorUntinted = expandableRow.getBackgroundColorWithoutTint();
		if (rowTranslationY >= shelfStart && mNotGoneIndex == -1) {
		mNotGoneIndex = notGoneIndex;
		setTintColor(previousColor);
		@@ -330,10 +320,10 @@ public class NotificationShelf extends ActivatableNotificationView implements
		if (colorOfViewBeforeLast == NO_COLOR) {
		colorOfViewBeforeLast = ownColorUntinted;
		}
		row.setOverrideTintColor(colorOfViewBeforeLast, inShelfAmount);
		expandableRow.setOverrideTintColor(colorOfViewBeforeLast, inShelfAmount);
		} else {
		colorOfViewBeforeLast = ownColorUntinted;
		row.setOverrideTintColor(NO_COLOR, 0 /* overrideAmount */);
		expandableRow.setOverrideTintColor(NO_COLOR, 0 /* overrideAmount */);
		}
		if (notGoneIndex != 0 \|\| !aboveShelf) {
		expandableRow.setAboveShelf(false);
		@@ -346,8 +336,8 @@ public class NotificationShelf extends ActivatableNotificationView implements
		// since they don't show up on AOD
		if (iconState != null && iconState.clampedAppearAmount == 1.0f) {
		// only if the first icon is fully in the shelf we want to clip to it!
		backgroundTop = (int) (row.getTranslationY() - getTranslationY());
		firstElementRoundness = row.getCurrentTopRoundness();
		backgroundTop = (int) (child.getTranslationY() - getTranslationY());
		firstElementRoundness = expandableRow.getCurrentTopRoundness();
		}
		}

		@@ -355,25 +345,31 @@ public class NotificationShelf extends ActivatableNotificationView implements
		notGoneIndex++;
		}

		if (row.isFirstInSection() && previousRow != null && previousRow.isLastInSection()) {
		// If the top of the shelf is between the view before a gap and the view after a gap
		// then we need to adjust the shelf's top roundness.
		float distanceToGapBottom = row.getTranslationY() - getTranslationY();
		if (child instanceof ActivatableNotificationView) {
		ActivatableNotificationView anv =
		(ActivatableNotificationView) child;
		if (anv.isFirstInSection() && previousAnv != null
		&& previousAnv.isLastInSection()) {
		// If the top of the shelf is between the view before a gap and the view after a
		// gap then we need to adjust the shelf's top roundness.
		float distanceToGapBottom = child.getTranslationY() - getTranslationY();
		float distanceToGapTop = getTranslationY()
		- (previousRow.getTranslationY() + previousRow.getActualHeight());
		- (previousAnv.getTranslationY() + previousAnv.getActualHeight());
		if (distanceToGapTop > 0) {
		// We interpolate our top roundness so that it's fully rounded if we're at the
		// bottom of the gap, and not rounded at all if we're at the top of the gap
		// (directly up against the bottom of previousRow)
		// Then we apply the same roundness to the bottom of previousRow so that the
		// corners join together as the shelf approaches previousRow.
		firstElementRoundness = (float) Math.min(1.0, distanceToGapTop / mGapHeight);
		previousRow.setBottomRoundness(firstElementRoundness,
		// We interpolate our top roundness so that it's fully rounded if we're at
		// the bottom of the gap, and not rounded at all if we're at the top of the
		// gap (directly up against the bottom of previousAnv)
		// Then we apply the same roundness to the bottom of previousAnv so that the
		// corners join together as the shelf approaches previousAnv.
		firstElementRoundness = (float) Math.min(1.0,
		distanceToGapTop / mGapHeight);
		previousAnv.setBottomRoundness(firstElementRoundness,
		false /* don't animate */);
		backgroundTop = (int) distanceToGapBottom;
		}
		}
		previousRow = row;
		previousAnv = anv;
		}
		}
		clipTransientViews();

		@@ -493,27 +489,27 @@ public class NotificationShelf extends ActivatableNotificationView implements
		* Update the clipping of this view.
		* @return the amount that our own top should be clipped
		*/
		private int updateNotificationClipHeight(ActivatableNotificationView row,
		private int updateNotificationClipHeight(ExpandableView view,
		float notificationClipEnd, int childIndex) {
		float viewEnd = row.getTranslationY() + row.getActualHeight();
		boolean isPinned = (row.isPinned() \|\| row.isHeadsUpAnimatingAway())
		&& !mAmbientState.isDozingAndNotPulsing(row);
		float viewEnd = view.getTranslationY() + view.getActualHeight();
		boolean isPinned = (view.isPinned() \|\| view.isHeadsUpAnimatingAway())
		&& !mAmbientState.isDozingAndNotPulsing(view);
		boolean shouldClipOwnTop;
		if (mAmbientState.isPulseExpanding()) {
		shouldClipOwnTop = childIndex == 0;
		} else {
		shouldClipOwnTop = row.showingPulsing();
		shouldClipOwnTop = view.showingPulsing();
		}
		if (viewEnd > notificationClipEnd && !shouldClipOwnTop
		&& (mAmbientState.isShadeExpanded() \|\| !isPinned)) {
		int clipBottomAmount = (int) (viewEnd - notificationClipEnd);
		if (isPinned) {
		clipBottomAmount = Math.min(row.getIntrinsicHeight() - row.getCollapsedHeight(),
		clipBottomAmount = Math.min(view.getIntrinsicHeight() - view.getCollapsedHeight(),
		clipBottomAmount);
		}
		row.setClipBottomAmount(clipBottomAmount);
		view.setClipBottomAmount(clipBottomAmount);
		} else {
		row.setClipBottomAmount(0);
		view.setClipBottomAmount(0);
		}
		if (shouldClipOwnTop) {
		return (int) (viewEnd - getTranslationY());
		@@ -532,31 +528,28 @@ public class NotificationShelf extends ActivatableNotificationView implements
		}

		/**
		* @return the icon amount how much this notification is in the shelf;
		* @return the amount how much this notification is in the shelf
		*/
		private float updateIconAppearance(ExpandableNotificationRow row, float expandAmount,
		private float updateShelfTransformation(ExpandableView view, float expandAmount,
		boolean scrolling, boolean scrollingFast, boolean expandingAnimated,
		boolean isLastChild) {
		StatusBarIconView icon = row.getEntry().expandedIcon;
		StatusBarIconView icon = view.getShelfIcon();
		NotificationIconContainer.IconState iconState = getIconState(icon);
		if (iconState == null) {
		return 0.0f;
		}

		// Let calculate how much the view is in the shelf
		float viewStart = row.getTranslationY();
		int fullHeight = row.getActualHeight() + mPaddingBetweenElements;
		float viewStart = view.getTranslationY();
		int fullHeight = view.getActualHeight() + mPaddingBetweenElements;
		float iconTransformDistance = getIntrinsicHeight() * 1.5f;
		iconTransformDistance *= NotificationUtils.interpolate(1.f, 1.5f, expandAmount);
		iconTransformDistance = Math.min(iconTransformDistance, fullHeight);
		if (isLastChild) {
		fullHeight = Math.min(fullHeight, row.getMinHeight() - getIntrinsicHeight());
		iconTransformDistance = Math.min(iconTransformDistance, row.getMinHeight()
		fullHeight = Math.min(fullHeight, view.getMinHeight() - getIntrinsicHeight());
		iconTransformDistance = Math.min(iconTransformDistance, view.getMinHeight()
		- getIntrinsicHeight());
		}
		float viewEnd = viewStart + fullHeight;
		// TODO: fix this check for anchor scrolling.
		if (expandingAnimated && mAmbientState.getScrollY() == 0
		if (iconState != null && expandingAnimated && mAmbientState.getScrollY() == 0
		&& !mAmbientState.isOnKeyguard() && !iconState.isLastExpandIcon) {
		// We are expanding animated. Because we switch to a linear interpolation in this case,
		// the last icon may be stuck in between the shelf position and the notification
		@@ -566,10 +559,10 @@ public class NotificationShelf extends ActivatableNotificationView implements
		// We need to persist this, since after the expansion, the behavior should still be the
		// same.
		float position = mAmbientState.getIntrinsicPadding()
		+ mHostLayout.getPositionInLinearLayout(row);
		+ mHostLayout.getPositionInLinearLayout(view);
		int maxShelfStart = mMaxLayoutHeight - getIntrinsicHeight();
		if (position < maxShelfStart && position + row.getIntrinsicHeight() >= maxShelfStart
		&& row.getTranslationY() < position) {
		if (position < maxShelfStart && position + view.getIntrinsicHeight() >= maxShelfStart
		&& view.getTranslationY() < position) {
		iconState.isLastExpandIcon = true;
		iconState.customTransformHeight = NO_VALUE;
		// Let's check if we're close enough to snap into the shelf
		@@ -584,16 +577,16 @@ public class NotificationShelf extends ActivatableNotificationView implements
		}
		}
		float fullTransitionAmount;
		float iconTransitionAmount;
		float transitionAmount;
		float shelfStart = getTranslationY();
		if (iconState.hasCustomTransformHeight()) {
		if (iconState != null && iconState.hasCustomTransformHeight()) {
		fullHeight = iconState.customTransformHeight;
		iconTransformDistance = iconState.customTransformHeight;
		}
		boolean fullyInOrOut = true;
		if (viewEnd >= shelfStart && (!mAmbientState.isUnlockHintRunning() \|\| row.isInShelf())
		if (viewEnd >= shelfStart && (!mAmbientState.isUnlockHintRunning() \|\| view.isInShelf())
		&& (mAmbientState.isShadeExpanded()
		\|\| (!row.isPinned() && !row.isHeadsUpAnimatingAway()))) {
		\|\| (!view.isPinned() && !view.isHeadsUpAnimatingAway()))) {
		if (viewStart < shelfStart) {
		float fullAmount = (shelfStart - viewStart) / fullHeight;
		fullAmount = Math.min(1.0f, fullAmount);
		@@ -603,41 +596,44 @@ public class NotificationShelf extends ActivatableNotificationView implements
		interpolatedAmount, fullAmount, expandAmount);
		fullTransitionAmount = 1.0f - interpolatedAmount;

		iconTransitionAmount = (shelfStart - viewStart) / iconTransformDistance;
		iconTransitionAmount = Math.min(1.0f, iconTransitionAmount);
		iconTransitionAmount = 1.0f - iconTransitionAmount;
		transitionAmount = (shelfStart - viewStart) / iconTransformDistance;
		transitionAmount = Math.min(1.0f, transitionAmount);
		transitionAmount = 1.0f - transitionAmount;
		fullyInOrOut = false;
		} else {
		fullTransitionAmount = 1.0f;
		iconTransitionAmount = 1.0f;
		transitionAmount = 1.0f;
		}
		} else {
		fullTransitionAmount = 0.0f;
		iconTransitionAmount = 0.0f;
		transitionAmount = 0.0f;
		}
		if (fullyInOrOut && !expandingAnimated && iconState.isLastExpandIcon) {
		if (iconState != null && fullyInOrOut && !expandingAnimated && iconState.isLastExpandIcon) {
		iconState.isLastExpandIcon = false;
		iconState.customTransformHeight = NO_VALUE;
		}
		updateIconPositioning(row, iconTransitionAmount, fullTransitionAmount,
		updateIconPositioning(view, transitionAmount, fullTransitionAmount,
		iconTransformDistance, scrolling, scrollingFast, expandingAnimated, isLastChild);
		return fullTransitionAmount;
		}

		private void updateIconPositioning(ExpandableNotificationRow row, float iconTransitionAmount,
		private void updateIconPositioning(ExpandableView view, float iconTransitionAmount,
		float fullTransitionAmount, float iconTransformDistance, boolean scrolling,
		boolean scrollingFast, boolean expandingAnimated, boolean isLastChild) {
		StatusBarIconView icon = row.getEntry().expandedIcon;
		StatusBarIconView icon = view.getShelfIcon();
		NotificationIconContainer.IconState iconState = getIconState(icon);
		float contentTransformationAmount;
		if (iconState == null) {
		return;
		}
		boolean forceInShelf = iconState.isLastExpandIcon && !iconState.hasCustomTransformHeight();
		contentTransformationAmount = iconTransitionAmount;
		} else {
		boolean forceInShelf =
		iconState.isLastExpandIcon && !iconState.hasCustomTransformHeight();
		float clampedAmount = iconTransitionAmount > 0.5f ? 1.0f : 0.0f;
		if (clampedAmount == fullTransitionAmount) {
		iconState.noAnimations = (scrollingFast \|\| expandingAnimated) && !forceInShelf;
		iconState.useFullTransitionAmount = iconState.noAnimations
		\|\| (!ICON_ANMATIONS_WHILE_SCROLLING && fullTransitionAmount == 0.0f && scrolling);
		\|\| (!ICON_ANMATIONS_WHILE_SCROLLING && fullTransitionAmount == 0.0f
		&& scrolling);
		iconState.useLinearTransitionAmount = !ICON_ANMATIONS_WHILE_SCROLLING
		&& fullTransitionAmount == 0.0f && !mAmbientState.isExpansionChanging();
		iconState.translateContent = mMaxLayoutHeight - getTranslationY()
		@@ -656,9 +652,10 @@ public class NotificationShelf extends ActivatableNotificationView implements
		iconState.translateContent = false;
		}
		float transitionAmount;
		if (mAmbientState.isHiddenAtAll() && !row.isInShelf()) {
		if (mAmbientState.isHiddenAtAll() && !view.isInShelf()) {
		transitionAmount = mAmbientState.isFullyHidden() ? 1 : 0;
		} else if (isLastChild \|\| !USE_ANIMATIONS_WHEN_OPENING \|\| iconState.useFullTransitionAmount
		} else if (isLastChild \|\| !USE_ANIMATIONS_WHEN_OPENING
		\|\| iconState.useFullTransitionAmount
		\|\| iconState.useLinearTransitionAmount) {
		transitionAmount = iconTransitionAmount;
		} else {
		@@ -672,19 +669,25 @@ public class NotificationShelf extends ActivatableNotificationView implements
		? fullTransitionAmount
		: transitionAmount;
		iconState.clampedAppearAmount = clampedAmount;
		float contentTransformationAmount = !row.isAboveShelf() && !row.showingPulsing()
		contentTransformationAmount = !view.isAboveShelf() && !view.showingPulsing()
		&& (isLastChild \|\| iconState.translateContent)
		? iconTransitionAmount
		: 0.0f;
		row.setContentTransformationAmount(contentTransformationAmount, isLastChild);
		setIconTransformationAmount(row, transitionAmount, iconTransformDistance,
		setIconTransformationAmount(view, transitionAmount, iconTransformDistance,
		clampedAmount != transitionAmount, isLastChild);
		}
		view.setContentTransformationAmount(contentTransformationAmount, isLastChild);
		}

		private void setIconTransformationAmount(ExpandableNotificationRow row,
		private void setIconTransformationAmount(ExpandableView view,
		float transitionAmount, float iconTransformDistance, boolean usingLinearInterpolation,
		boolean isLastChild) {
		StatusBarIconView icon = row.getEntry().expandedIcon;
		if (!(view instanceof ExpandableNotificationRow)) {
		return;
		}
		ExpandableNotificationRow row = (ExpandableNotificationRow) view;

		StatusBarIconView icon = row.getShelfIcon();
		NotificationIconContainer.IconState iconState = getIconState(icon);

		View rowIcon = row.getNotificationIcon();
		@@ -950,6 +953,11 @@ public class NotificationShelf extends ActivatableNotificationView implements
		updateRelativeOffset();
		}

		@Override
		public boolean needsClippingToShelf() {
		return false;
		}

		public void onUiModeChanged() {
		updateBackgroundColors();
		}