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 am: da82413344

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

Change-Id: I7565a49fd8479ab3608377e3a5099bfc118f0bc6
This commit is contained in:
Lyn Han
2022-03-16 17:55:49 +00:00
committed by Automerger Merge Worker
parent 32076363d6 da82413344
commit 548b6146e7
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)
: getWidth();
ActivatableNotificationView anv = (ActivatableNotificationView) this;
NotificationBackgroundView bg = anv.getBackgroundNormal();
if (bg != null) {
anv.getBackgroundNormal().setActualWidth((int) actualWidth);
}
anv.setBackgroundWidth((int) actualWidth);
if (mShelfIcons != null) {
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() {
return mBackgroundNormal;
public void setBackgroundWidth(int width) {
if (mBackgroundNormal == null) {
return;
}
mBackgroundNormal.setActualWidth(width);
}
@Override