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

Commit 888799eb authored by Ned Burns's avatar Ned Burns Committed by Android (Google) Code Review
Browse files

Merge "Remove ENR.mStatusBarNotification"

parents adac378a 1c2b85a4

packages/SystemUI/src/com/android/systemui/statusbar/MediaTransferManager.java

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class MediaTransferManager { 


            ViewParent parent = view.getParent();

            StatusBarNotification statusBarNotification =

                    getRowForParent(parent).getStatusBarNotification();

                    getRowForParent(parent).getEntry().getSbn();

            final Intent intent = new Intent()

                    .setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT)

                    .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME,

packages/SystemUI/src/com/android/systemui/statusbar/NotificationHeaderUtil.java

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public class NotificationHeaderUtil { 
    private static  final DataExtractor sIconExtractor = new DataExtractor() {

        @Override

        public Object extractData(ExpandableNotificationRow row) {

            return row.getStatusBarNotification().getNotification();

            return row.getEntry().getSbn().getNotification();

        }

    };

    private static final IconComparator sIconVisibilityComparator = new IconComparator() {
@@ -207,7 +207,7 @@ public class NotificationHeaderUtil { 
        }

        // in case no view is visible we make sure the time is visible

        int timeVisibility = !hasVisibleText

                || mRow.getStatusBarNotification().getNotification().showsTime()

                || mRow.getEntry().getSbn().getNotification().showsTime()

                ? View.VISIBLE : View.GONE;

        time.setVisibility(timeVisibility);

        View left = null;

packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ public class NotificationRemoteInputManager implements Dumpable { 
        private StatusBarNotification getNotificationForParent(ViewParent parent) {

            while (parent != null) {

                if (parent instanceof ExpandableNotificationRow) {

                    return ((ExpandableNotificationRow) parent).getStatusBarNotification();

                    return ((ExpandableNotificationRow) parent).getEntry().getSbn();

                }

                parent = parent.getParent();

            }

packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle 
        }



        for (ExpandableNotificationRow viewToRemove : viewsToRemove) {

            if (mGroupManager.isChildInGroupWithSummary(viewToRemove.getStatusBarNotification())) {

            if (mGroupManager.isChildInGroupWithSummary(viewToRemove.getEntry().getSbn())) {

                // we are only transferring this notification to its parent, don't generate an

                // animation

                mListContainer.setChildTransferInProgress(true);
@@ -339,7 +339,7 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle 
                for (ExpandableNotificationRow remove : toRemove) {

                    parent.removeChildNotification(remove);

                    if (mEntryManager.getActiveNotificationUnfiltered(

                            remove.getStatusBarNotification().getKey()) == null) {

                            remove.getEntry().getSbn().getKey()) == null) {

                        // We only want to add an animation if the view is completely removed

                        // otherwise it's just a transfer

                        mListContainer.notifyGroupChildRemoved(remove,

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationClicker.java

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public final class NotificationClicker implements View.OnClickListener { 
        mShadeController.wakeUpIfDozing(SystemClock.uptimeMillis(), v, "NOTIFICATION_CLICK");



        final ExpandableNotificationRow row = (ExpandableNotificationRow) v;

        final StatusBarNotification sbn = row.getStatusBarNotification();

        final StatusBarNotification sbn = row.getEntry().getSbn();

        if (sbn == null) {

            Log.e(TAG, "NotificationClicker called on an unclickable notification,");

            return;