Merge "Fix inflating content views after removal" into rvc-dev (76807053) · Commits · e / os / android_frameworks_base

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

+9 −7

Original line number	Diff line number	Diff line
		@@ -807,7 +807,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		// TODO: Move inflation logic out of this call
		if (mIsChildInGroup != isChildInGroup) {
		mIsChildInGroup = isChildInGroup;
		if (mIsLowPriority) {
		if (!isRemoved() && mIsLowPriority) {
		RowContentBindParams params = mRowContentBindStage.getStageParams(mEntry);
		params.setUseLowPriority(mIsLowPriority);
		mRowContentBindStage.requestRebind(mEntry, null /* callback */);
		@@ -1576,6 +1576,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		// TODO: Move inflation logic out of this call and remove this method
		if (mNeedsRedaction != needsRedaction) {
		mNeedsRedaction = needsRedaction;
		if (!isRemoved()) {
		RowContentBindParams params = mRowContentBindStage.getStageParams(mEntry);
		if (needsRedaction) {
		params.requireContentViews(FLAG_CONTENT_VIEW_PUBLIC);
		@@ -1585,6 +1586,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		mRowContentBindStage.requestRebind(mEntry, null /* callback */);
		}
		}
		}

		public interface ExpansionLogger {
		void logNotificationExpansion(String key, boolean userAction, boolean expanded);