Merge "Fix incorrect placement of HUN icon in statusbar" into main
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LegacyNotificationIconAreaControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LegacyNotificationIconAreaControllerImpl.java
index dd32434..649a4ac 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LegacyNotificationIconAreaControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LegacyNotificationIconAreaControllerImpl.java
@@ -512,7 +512,7 @@
}
public void showIconIsolated(StatusBarIconView icon, boolean animated) {
- mNotificationIcons.showIconIsolated(icon, animated);
+ mNotificationIcons.showIconIsolatedLegacy(icon, animated);
}
public void setIsolatedIconLocation(@NotNull Rect iconDrawingRect, boolean requireStateUpdate) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java
index efb8e2c..75a697f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java
@@ -701,13 +701,13 @@
}
@Deprecated
- public void showIconIsolated(StatusBarIconView icon, boolean animated) {
+ public void showIconIsolatedLegacy(StatusBarIconView icon, boolean animated) {
NotificationIconContainerRefactor.assertInLegacyMode();
if (animated) {
- showIconIsolatedAnimated(icon, null);
- } else {
- showIconIsolated(icon);
+ mIsolatedIconForAnimation = icon != null ? icon : mIsolatedIcon;
}
+ mIsolatedIcon = icon;
+ updateState();
}
public void showIconIsolatedAnimated(StatusBarIconView icon,