Merge "Revert "Fix notification group dismissal fade animation"" into tm-qpr-dev am: 80b4539ccb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20209947

Change-Id: I2e5d458b5880b29d7d67cdfd8ec09d35dff571ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Johannes Gallmann
2022-10-18 16:57:44 +00:00
committed by Automerger Merge Worker
2 changed files with 1 additions and 15 deletions

View File

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

View File

@@ -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) {