Merge "Update notifyHeightChanged() argument comments to use the correct syntax" into main (5e564dbb) · Commits · e / os / android_frameworks_base

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

+11 −11

Original line number	Diff line number	Diff line
		@@ -353,7 +353,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		nowExpanded = !isExpanded();
		setUserExpanded(nowExpanded);
		}
		notifyHeightChanged(true);
		notifyHeightChanged(/* needsAnimation= */ true);
		mOnExpandClickListener.onExpandClicked(mEntry, v, nowExpanded);
		mMetricsLogger.action(MetricsEvent.ACTION_NOTIFICATION_EXPANDER, nowExpanded);
		}
		@@ -776,7 +776,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		mChildrenContainer.updateGroupOverflow();
		}
		if (intrinsicBefore != getIntrinsicHeight()) {
		notifyHeightChanged(false /* needsAnimation */);
		notifyHeightChanged(/* needsAnimation= */ false);
		}
		if (isHeadsUp) {
		mMustStayOnScreen = true;
		@@ -824,7 +824,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		if (mChildrenContainer != null) {
		mChildrenContainer.setHeaderVisibleAmount(headerVisibleAmount);
		}
		notifyHeightChanged(false /* needsAnimation */);
		notifyHeightChanged(/* needsAnimation= */ false);
		}
		}

		@@ -1086,7 +1086,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		boolean wasAboveShelf = isAboveShelf();
		mIsPinned = pinned;
		if (intrinsicHeight != getIntrinsicHeight()) {
		notifyHeightChanged(false /* needsAnimation */);
		notifyHeightChanged(/* needsAnimation= */ false);
		}
		if (pinned) {
		setAnimationRunning(true);
		@@ -2609,7 +2609,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		onExpansionChanged(true /* userAction */, wasExpanded);
		if (!wasExpanded && isExpanded()
		&& getActualHeight() != getIntrinsicHeight()) {
		notifyHeightChanged(true /* needsAnimation */);
		notifyHeightChanged(/* needsAnimation= */ true);
		}
		}

		@@ -2621,7 +2621,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		if (mIsSummaryWithChildren) {
		mChildrenContainer.onExpansionChanged();
		}
		notifyHeightChanged(false /* needsAnimation */);
		notifyHeightChanged(/* needsAnimation= */ false);
		}
		updateShelfIconColor();
		}
		@@ -2659,7 +2659,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		if (expand != mIsSystemExpanded) {
		final boolean wasExpanded = isExpanded();
		mIsSystemExpanded = expand;
		notifyHeightChanged(false /* needsAnimation */);
		notifyHeightChanged(/* needsAnimation= */ false);
		onExpansionChanged(false /* userAction */, wasExpanded);
		if (mIsSummaryWithChildren) {
		mChildrenContainer.updateGroupOverflow();
		@@ -2678,7 +2678,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		if (mIsSummaryWithChildren) {
		mChildrenContainer.updateGroupOverflow();
		}
		notifyHeightChanged(false /* needsAnimation */);
		notifyHeightChanged(/* needsAnimation= */ false);
		}
		if (isAboveShelf() != wasAboveShelf) {
		mAboveShelfChangedListener.onAboveShelfStateChanged(!wasAboveShelf);
		@@ -2835,7 +2835,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		super.onLayout(changed, left, top, right, bottom);
		if (intrinsicBefore != getIntrinsicHeight()
		&& (intrinsicBefore != 0 \|\| getActualHeight() > 0)) {
		notifyHeightChanged(true /* needsAnimation */);
		notifyHeightChanged(/* needsAnimation= */ true);
		}
		if (mMenuRow != null && mMenuRow.getMenuView() != null) {
		mMenuRow.onParentHeightUpdate();
		@@ -2878,7 +2878,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		mSensitiveHiddenInGeneral = hideSensitive;
		int intrinsicAfter = getIntrinsicHeight();
		if (intrinsicBefore != intrinsicAfter) {
		notifyHeightChanged(true);
		notifyHeightChanged(/* needsAnimation= */ true);
		}
		}

		@@ -3015,7 +3015,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		if (isChildInGroup()) {
		mGroupExpansionManager.setGroupExpanded(mEntry, true);
		}
		notifyHeightChanged(false /* needsAnimation */);
		notifyHeightChanged(/* needsAnimation= */ false);
		}

		public void setChildrenExpanded(boolean expanded, boolean animate) {