Merge \"Fixes issue with group backgrounds when animating to keyguard\" into nyc-dev (337c7143) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -140,11 +140,10 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
	@Override		@Override
	public void onClick(View v) {		public void onClick(View v) {
	if (!mShowingPublic && mGroupManager.isSummaryOfGroup(mStatusBarNotification)) {		if (!mShowingPublic && mGroupManager.isSummaryOfGroup(mStatusBarNotification)) {
			mGroupExpansionChanging = true;
	final boolean wasExpanded = mGroupManager.isGroupExpanded(mStatusBarNotification);		final boolean wasExpanded = mGroupManager.isGroupExpanded(mStatusBarNotification);
	boolean nowExpanded = mGroupManager.toggleGroupExpansion(mStatusBarNotification);		boolean nowExpanded = mGroupManager.toggleGroupExpansion(mStatusBarNotification);
	mOnExpandClickListener.onExpandClicked(mEntry, nowExpanded);		mOnExpandClickListener.onExpandClicked(mEntry, nowExpanded);
	mGroupExpansionChanging = true;
	updateBackgroundForGroupState();
	MetricsLogger.action(mContext, MetricsEvent.ACTION_NOTIFICATION_GROUP_EXPANDER,		MetricsLogger.action(mContext, MetricsEvent.ACTION_NOTIFICATION_GROUP_EXPANDER,
	nowExpanded);		nowExpanded);
	logExpansionEvent(true /* userAction */, wasExpanded);		logExpansionEvent(true /* userAction */, wasExpanded);
	@@ -1343,6 +1342,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
	if (mChildrenContainer != null) {		if (mChildrenContainer != null) {
	mChildrenContainer.setChildrenExpanded(expanded);		mChildrenContainer.setChildrenExpanded(expanded);
	}		}
			updateBackgroundForGroupState();
	updateClickAndFocus();		updateClickAndFocus();
	}		}