Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Encapsulate background width updates to ActivatableNotificationView" into tm-dev

Browse Source
This commit is contained in:
Lyn Han
2022-03-16 17:46:59 +00:00
committed by Android (Google) Code Review
parent 0d1d776e3a 1e9d304307
commit da82413344
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
View File

@@ -226,10 +226,7 @@ public class NotificationShelf extends ActivatableNotificationView implements
? MathUtils.lerp(shortestWidth, getWidth(), fractionToShade) ? MathUtils.lerp(shortestWidth, getWidth(), fractionToShade)
: getWidth(); : getWidth();
ActivatableNotificationView anv = (ActivatableNotificationView) this; ActivatableNotificationView anv = (ActivatableNotificationView) this;
NotificationBackgroundView bg = anv.getBackgroundNormal(); anv.setBackgroundWidth((int) actualWidth);
if (bg != null) {
anv.getBackgroundNormal().setActualWidth((int) actualWidth);
}
if (mShelfIcons != null) { if (mShelfIcons != null) {
mShelfIcons.setActualLayoutWidth((int) actualWidth); mShelfIcons.setActualLayoutWidth((int) actualWidth);
} }

9
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java
View File

@@ -163,10 +163,13 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
} }
/** /**
* @return The background of this view. * @param width The actual width to apply to the background view.
*/ */
public NotificationBackgroundView getBackgroundNormal() { public void setBackgroundWidth(int width) {
return mBackgroundNormal; if (mBackgroundNormal == null) {
return;
}
mBackgroundNormal.setActualWidth(width);
} }
@Override @Override