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

Commit a379eeca authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Fix notifications transitioning from small->big."

parents c1c2ca0c 84920cc5

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

+7 −3
Original line number Diff line number Diff line
@@ -591,10 +591,14 @@ public class PhoneStatusBar extends BaseStatusBar { 
        }



        final StatusBarNotification oldNotification = oldEntry.notification;

        final RemoteViews oldContentView = oldNotification.notification.contentView;



        final RemoteViews contentView = notification.notification.contentView;



        // XXX: modify when we do something more intelligent with the two content views

        final RemoteViews oldContentView = (oldNotification.notification.bigContentView != null) 

                ? oldNotification.notification.bigContentView

                : oldNotification.notification.contentView;

        final RemoteViews contentView = (notification.notification.bigContentView != null) 

                ? notification.notification.bigContentView

                : notification.notification.contentView;



        if (DEBUG) {

            Slog.d(TAG, "old notification: when=" + oldNotification.notification.when

packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java

+7 −2
Original line number Diff line number Diff line
@@ -867,9 +867,14 @@ public class TabletStatusBar extends BaseStatusBar implements 
        }



        final StatusBarNotification oldNotification = oldEntry.notification;

        final RemoteViews oldContentView = oldNotification.notification.contentView;



        final RemoteViews contentView = notification.notification.contentView;

        // XXX: modify when we do something more intelligent with the two content views

        final RemoteViews oldContentView = (oldNotification.notification.bigContentView != null) 

                ? oldNotification.notification.bigContentView

                : oldNotification.notification.contentView;

        final RemoteViews contentView = (notification.notification.bigContentView != null) 

                ? notification.notification.bigContentView

                : notification.notification.contentView;



        if (DEBUG) {

            Slog.d(TAG, "old notification: when=" + oldNotification.notification.when