Merge "Fix notification shelf icon showing on top of snooze leave behind" (e4b106b1) · Commits · e / os / android_frameworks_base

packages/SystemUI/plugin/src/com/android/systemui/plugins/statusbar/NotificationMenuRowProvider.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,8 @@ public interface NotificationMenuRowProvider extends Plugin {
		public View getContentView();

		public boolean handleCloseControls(boolean save);

		public boolean willBeRemoved();
		}

		public interface SnoozeGutsContent extends GutsContent {

+3 −0

Original line number	Diff line number	Diff line
		@@ -902,6 +902,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
		* @return whether the notification is currently showing a view with an icon.
		*/
		public boolean isShowingIcon() {
		if (areGutsExposed()) {
		return false;
		}
		if (mIsSummaryWithChildren) {
		return true;
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -244,6 +244,10 @@ public class NotificationGuts extends FrameLayout
		}
		}

		public boolean willBeRemoved() {
		return mGutsContent != null ? mGutsContent.willBeRemoved() : false;
		}

		public boolean isExposed() {
		return mExposed;
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -273,6 +273,11 @@ public class NotificationInfo extends LinearLayout implements GutsContent {
		mGutsInteractionListener = listener;
		}

		@Override
		public boolean willBeRemoved() {
		return !mChannelEnabledSwitch.isChecked();
		}

		@Override
		public View getContentView() {
		return this;

+4 −3

Original line number	Diff line number	Diff line
		@@ -380,11 +380,12 @@ public class NotificationShelf extends ActivatableNotificationView {
		: 0.0f;
		row.setContentTransformationAmount(contentTransformationAmount, isLastChild);
		setIconTransformationAmount(row, transitionAmount, iconTransformDistance,
		clampedAmount != transitionAmount);
		clampedAmount != transitionAmount, isLastChild);
		}

		private void setIconTransformationAmount(ExpandableNotificationRow row,
		float transitionAmount, float iconTransformDistance, boolean usingLinearInterpolation) {
		float transitionAmount, float iconTransformDistance, boolean usingLinearInterpolation,
		boolean isLastChild) {
		StatusBarIconView icon = row.getEntry().expandedIcon;
		NotificationIconContainer.IconState iconState = getIconState(icon);

		@@ -437,7 +438,7 @@ public class NotificationShelf extends ActivatableNotificationView {
		iconState.scaleY = 1.0f;
		iconState.hidden = false;
		}
		if (row.isAboveShelf()) {
		if (row.isAboveShelf() \|\| (!row.isInShelf() && isLastChild && row.areGutsExposed())) {
		iconState.hidden = true;
		}
		int shelfColor = icon.getStaticDrawableColor();