Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d9b7ee8 authored by Steve Elliott's avatar Steve Elliott Committed by Android (Google) Code Review
Browse files

Merge "Fix incorrect placement of HUN icon in statusbar" into main

parents c3c93d78 2f34ff4e

packages/SystemUI/src/com/android/systemui/statusbar/phone/LegacyNotificationIconAreaControllerImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ public class LegacyNotificationIconAreaControllerImpl implements 
    }



    public void showIconIsolated(StatusBarIconView icon, boolean animated) {

        mNotificationIcons.showIconIsolated(icon, animated);

        mNotificationIcons.showIconIsolatedLegacy(icon, animated);

    }



    public void setIsolatedIconLocation(@NotNull Rect iconDrawingRect, boolean requireStateUpdate) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java

+4 −4
Original line number Diff line number Diff line
@@ -701,13 +701,13 @@ public class NotificationIconContainer extends ViewGroup { 
    }



    @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,