Merge "Revert "Fix notification group dismissal fade animation"" into tm-qpr-dev (80b4539c) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1487,7 +1487,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		l.setAlpha(alpha);
		}
		if (mChildrenContainer != null) {
		mChildrenContainer.setContentAlpha(alpha);
		mChildrenContainer.setAlpha(alpha);
		}
		}

+0 −14

Original line number	Diff line number	Diff line
		@@ -461,20 +461,6 @@ public class NotificationChildrenContainer extends ViewGroup
		return mAttachedChildren;
		}

		/**
		* Sets the alpha on the content, while leaving the background of the container itself as is.
		*
		* @param alpha alpha value to apply to the content
		*/
		public void setContentAlpha(float alpha) {
		for (int i = 0; i < mNotificationHeader.getChildCount(); i++) {
		mNotificationHeader.getChildAt(i).setAlpha(alpha);
		}
		for (ExpandableNotificationRow child : getAttachedChildren()) {
		child.setContentAlpha(alpha);
		}
		}

		/** To be called any time the rows have been updated */
		public void updateExpansionStates() {
		if (mChildrenExpanded \|\| mUserLocked) {