Merge "Log.wtf when float properties in ViewState are set to NaN." into tm-qpr-dev (b65bc409) · Commits · e / os / android_frameworks_base

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

+9 −9

Original line number	Diff line number	Diff line
		@@ -189,22 +189,22 @@ public class NotificationShelf extends ActivatableNotificationView implements
		viewState.copyFrom(lastViewState);

		viewState.height = getIntrinsicHeight();
		viewState.zTranslation = ambientState.getBaseZHeight();
		viewState.setZTranslation(ambientState.getBaseZHeight());
		viewState.clipTopAmount = 0;

		if (ambientState.isExpansionChanging() && !ambientState.isOnKeyguard()) {
		float expansion = ambientState.getExpansionFraction();
		if (ambientState.isBouncerInTransit()) {
		viewState.alpha = aboutToShowBouncerProgress(expansion);
		viewState.setAlpha(aboutToShowBouncerProgress(expansion));
		} else {
		viewState.alpha = ShadeInterpolation.getContentAlpha(expansion);
		viewState.setAlpha(ShadeInterpolation.getContentAlpha(expansion));
		}
		} else {
		viewState.alpha = 1f - ambientState.getHideAmount();
		viewState.setAlpha(1f - ambientState.getHideAmount());
		}
		viewState.belowSpeedBump = mHostLayoutController.getSpeedBumpIndex() == 0;
		viewState.hideSensitive = false;
		viewState.xTranslation = getTranslationX();
		viewState.setXTranslation(getTranslationX());
		viewState.hasItemsInStableShelf = lastViewState.inShelf;
		viewState.firstViewInShelf = algorithmState.firstViewInShelf;
		if (mNotGoneIndex != -1) {
		@@ -230,7 +230,7 @@ public class NotificationShelf extends ActivatableNotificationView implements
		}

		final float stackEnd = ambientState.getStackY() + ambientState.getStackHeight();
		viewState.yTranslation = stackEnd - viewState.height;
		viewState.setYTranslation(stackEnd - viewState.height);
		} else {
		viewState.hidden = true;
		viewState.location = ExpandableViewState.LOCATION_GONE;
		@@ -794,7 +794,7 @@ public class NotificationShelf extends ActivatableNotificationView implements
		if (iconState == null) {
		return;
		}
		iconState.alpha = ICON_ALPHA_INTERPOLATOR.getInterpolation(transitionAmount);
		iconState.setAlpha(ICON_ALPHA_INTERPOLATOR.getInterpolation(transitionAmount));
		boolean isAppearing = row.isDrawingAppearAnimation() && !row.isInShelf();
		iconState.hidden = isAppearing
		\|\| (view instanceof ExpandableNotificationRow
		@@ -809,12 +809,12 @@ public class NotificationShelf extends ActivatableNotificationView implements

		// Fade in icons at shelf start
		// This is important for conversation icons, which are badged and need x reset
		iconState.xTranslation = mShelfIcons.getActualPaddingStart();
		iconState.setXTranslation(mShelfIcons.getActualPaddingStart());

		final boolean stayingInShelf = row.isInShelf() && !row.isTransformingIntoShelf();
		if (stayingInShelf) {
		iconState.iconAppearAmount = 1.0f;
		iconState.alpha = 1.0f;
		iconState.setAlpha(1.0f);
		iconState.hidden = false;
		}
		int backgroundColor = getBackgroundColorWithoutTint();

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -3376,7 +3376,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView

		private void handleFixedTranslationZ(ExpandableNotificationRow row) {
		if (row.hasExpandingChild()) {
		zTranslation = row.getTranslationZ();
		setZTranslation(row.getTranslationZ());
		clipTopAmount = row.getClipTopAmount();
		}
		}

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -621,12 +621,12 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable {
		// initialize with the default values of the view
		mViewState.height = getIntrinsicHeight();
		mViewState.gone = getVisibility() == View.GONE;
		mViewState.alpha = 1f;
		mViewState.setAlpha(1f);
		mViewState.notGoneIndex = -1;
		mViewState.xTranslation = getTranslationX();
		mViewState.setXTranslation(getTranslationX());
		mViewState.hidden = false;
		mViewState.scaleX = getScaleX();
		mViewState.scaleY = getScaleY();
		mViewState.setScaleX(getScaleX());
		mViewState.setScaleY(getScaleY());
		mViewState.inShelf = false;
		mViewState.headsUpIsVisible = false;

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

+37 −32

Original line number	Diff line number	Diff line
		@@ -583,24 +583,26 @@ public class NotificationChildrenContainer extends ViewGroup
		ExpandableViewState childState = child.getViewState();
		int intrinsicHeight = child.getIntrinsicHeight();
		childState.height = intrinsicHeight;
		childState.yTranslation = yPosition + launchTransitionCompensation;
		childState.setYTranslation(yPosition + launchTransitionCompensation);
		childState.hidden = false;
		// When the group is expanded, the children cast the shadows rather than the parent
		// so use the parent's elevation here.
		childState.zTranslation =
		(childrenExpandedAndNotAnimating && mEnableShadowOnChildNotifications)
		? parentState.zTranslation
		: 0;
		if (childrenExpandedAndNotAnimating && mEnableShadowOnChildNotifications) {
		childState.setZTranslation(parentState.getZTranslation());
		} else {
		childState.setZTranslation(0);
		}
		childState.dimmed = parentState.dimmed;
		childState.hideSensitive = parentState.hideSensitive;
		childState.belowSpeedBump = parentState.belowSpeedBump;
		childState.clipTopAmount = 0;
		childState.alpha = 0;
		childState.setAlpha(0);
		if (i < firstOverflowIndex) {
		childState.alpha = showingAsLowPriority() ? expandFactor : 1.0f;
		childState.setAlpha(showingAsLowPriority() ? expandFactor : 1.0f);
		} else if (expandFactor == 1.0f && i <= lastVisibleIndex) {
		childState.alpha = (mActualHeight - childState.yTranslation) / childState.height;
		childState.alpha = Math.max(0.0f, Math.min(1.0f, childState.alpha));
		childState.setAlpha(
		(mActualHeight - childState.getYTranslation()) / childState.height);
		childState.setAlpha(Math.max(0.0f, Math.min(1.0f, childState.getAlpha())));
		}
		childState.location = parentState.location;
		childState.inShelf = parentState.inShelf;
		@@ -621,13 +623,16 @@ public class NotificationChildrenContainer extends ViewGroup
		if (mirrorView.getVisibility() == GONE) {
		mirrorView = alignView;
		}
		mGroupOverFlowState.alpha = mirrorView.getAlpha();
		mGroupOverFlowState.yTranslation += NotificationUtils.getRelativeYOffset(
		mGroupOverFlowState.setAlpha(mirrorView.getAlpha());
		float yTranslation = mGroupOverFlowState.getYTranslation()
		+ NotificationUtils.getRelativeYOffset(
		mirrorView, overflowView);
		mGroupOverFlowState.setYTranslation(yTranslation);
		}
		} else {
		mGroupOverFlowState.yTranslation += mNotificationHeaderMargin;
		mGroupOverFlowState.alpha = 0.0f;
		mGroupOverFlowState.setYTranslation(
		mGroupOverFlowState.getYTranslation() + mNotificationHeaderMargin);
		mGroupOverFlowState.setAlpha(0.0f);
		}
		}
		if (mNotificationHeader != null) {
		@@ -635,11 +640,11 @@ public class NotificationChildrenContainer extends ViewGroup
		mHeaderViewState = new ViewState();
		}
		mHeaderViewState.initFrom(mNotificationHeader);
		mHeaderViewState.zTranslation = childrenExpandedAndNotAnimating
		? parentState.zTranslation
		: 0;
		mHeaderViewState.yTranslation = mCurrentHeaderTranslation;
		mHeaderViewState.alpha = mHeaderVisibleAmount;
		mHeaderViewState.setZTranslation(childrenExpandedAndNotAnimating
		? parentState.getZTranslation()
		: 0);
		mHeaderViewState.setYTranslation(mCurrentHeaderTranslation);
		mHeaderViewState.setAlpha(mHeaderVisibleAmount);
		// The hiding is done automatically by the alpha, otherwise we'll pick it up again
		// in the next frame with the initFrom call above and have an invisible header
		mHeaderViewState.hidden = false;
		@@ -711,14 +716,14 @@ public class NotificationChildrenContainer extends ViewGroup
		// layout the divider
		View divider = mDividers.get(i);
		tmpState.initFrom(divider);
		tmpState.yTranslation = viewState.yTranslation - mDividerHeight;
		float alpha = mChildrenExpanded && viewState.alpha != 0 ? mDividerAlpha : 0;
		if (mUserLocked && !showingAsLowPriority() && viewState.alpha != 0) {
		tmpState.setYTranslation(viewState.getYTranslation() - mDividerHeight);
		float alpha = mChildrenExpanded && viewState.getAlpha() != 0 ? mDividerAlpha : 0;
		if (mUserLocked && !showingAsLowPriority() && viewState.getAlpha() != 0) {
		alpha = NotificationUtils.interpolate(0, mDividerAlpha,
		Math.min(viewState.alpha, expandFraction));
		Math.min(viewState.getAlpha(), expandFraction));
		}
		tmpState.hidden = !dividersVisible;
		tmpState.alpha = alpha;
		tmpState.setAlpha(alpha);
		tmpState.applyToView(divider);
		// There is no fake shadow to be drawn on the children
		child.setFakeShadowIntensity(0.0f, 0.0f, 0, 0);
		@@ -790,24 +795,24 @@ public class NotificationChildrenContainer extends ViewGroup
		// layout the divider
		View divider = mDividers.get(i);
		tmpState.initFrom(divider);
		tmpState.yTranslation = viewState.yTranslation - mDividerHeight;
		float alpha = mChildrenExpanded && viewState.alpha != 0 ? mDividerAlpha : 0;
		if (mUserLocked && !showingAsLowPriority() && viewState.alpha != 0) {
		tmpState.setYTranslation(viewState.getYTranslation() - mDividerHeight);
		float alpha = mChildrenExpanded && viewState.getAlpha() != 0 ? mDividerAlpha : 0;
		if (mUserLocked && !showingAsLowPriority() && viewState.getAlpha() != 0) {
		alpha = NotificationUtils.interpolate(0, mDividerAlpha,
		Math.min(viewState.alpha, expandFraction));
		Math.min(viewState.getAlpha(), expandFraction));
		}
		tmpState.hidden = !dividersVisible;
		tmpState.alpha = alpha;
		tmpState.setAlpha(alpha);
		tmpState.animateTo(divider, properties);
		// There is no fake shadow to be drawn on the children
		child.setFakeShadowIntensity(0.0f, 0.0f, 0, 0);
		}
		if (mOverflowNumber != null) {
		if (mNeverAppliedGroupState) {
		float alpha = mGroupOverFlowState.alpha;
		mGroupOverFlowState.alpha = 0;
		float alpha = mGroupOverFlowState.getAlpha();
		mGroupOverFlowState.setAlpha(0);
		mGroupOverFlowState.applyToView(mOverflowNumber);
		mGroupOverFlowState.alpha = alpha;
		mGroupOverFlowState.setAlpha(alpha);
		mNeverAppliedGroupState = false;
		}
		mGroupOverFlowState.animateTo(mOverflowNumber, properties);
		@@ -949,7 +954,7 @@ public class NotificationChildrenContainer extends ViewGroup
		child.setAlpha(start);
		ViewState viewState = new ViewState();
		viewState.initFrom(child);
		viewState.alpha = target;
		viewState.setAlpha(target);
		ALPHA_FADE_IN.setDelay(i * 50);
		viewState.animateTo(child, ALPHA_FADE_IN);
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3188,7 +3188,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable

		@ShadeViewRefactor(RefactorComponent.COORDINATOR)
		private boolean shouldHunAppearFromBottom(ExpandableViewState viewState) {
		return viewState.yTranslation + viewState.height
		return viewState.getYTranslation() + viewState.height
		>= mAmbientState.getMaxHeadsUpTranslation();
		}