Merge "Fixed an issue when launching notification groups" (898ab419) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimator.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -299,6 +299,10 @@ public class ActivityLaunchAnimator {
		return top;
		}

		public int getBottom() {
		return bottom;
		}

		public int getWidth() {
		return right - left;
		}

+8 −3

Original line number	Diff line number	Diff line
		@@ -2008,7 +2008,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		float interpolation = Interpolators.FAST_OUT_SLOW_IN.getInterpolation(params.getProgress());
		int startClipTopAmount = params.getStartClipTopAmount();
		if (mNotificationParent != null) {
		top -= mNotificationParent.getTranslationY();
		float parentY = mNotificationParent.getTranslationY();
		top -= parentY;
		mNotificationParent.setTranslationZ(translationZ);
		int parentStartClipTopAmount = params.getParentStartClipTopAmount();
		if (startClipTopAmount != 0) {
		@@ -2018,8 +2019,12 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		mNotificationParent.setClipTopAmount(clipTopAmount);
		}
		mNotificationParent.setExtraWidthForClipping(extraWidthForClipping);
		mNotificationParent.setMinimumHeightForClipping(params.getHeight()
		+ mNotificationParent.getActualHeight());
		float clipBottom = Math.max(params.getBottom(),
		parentY + mNotificationParent.getActualHeight()
		- mNotificationParent.getClipBottomAmount());
		float clipTop = Math.min(params.getTop(), parentY);
		int minimumHeightForClipping = (int) (clipBottom - clipTop);
		mNotificationParent.setMinimumHeightForClipping(minimumHeightForClipping);
		} else if (startClipTopAmount != 0) {
		int clipTopAmount = (int) MathUtils.lerp(startClipTopAmount, 0, interpolation);
		setClipTopAmount(clipTopAmount);