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

Commit 7a0010d2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add null check when populating popup" into ub-launcher3-dorval

parents 6c82867a 3ce144b4

src/com/android/launcher3/popup/PopupContainerWithArrow.java

+8 −8
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ import com.android.launcher3.shortcuts.DeepShortcutView; 
import com.android.launcher3.shortcuts.ShortcutsItemView;

import com.android.launcher3.util.PackageUserKey;



import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

import java.util.Map;
@@ -182,14 +184,12 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra 
            orientAboutIcon(originalIcon, arrowHeight + arrowVerticalOffset);

        }



        List<DeepShortcutView> shortcutViews = mShortcutsItemView.getDeepShortcutViews(reverseOrder);

        for (int i = 0; i < itemsToPopulate.length; i++) {

            switch (itemsToPopulate[i]) {

                case NOTIFICATION:

        List<DeepShortcutView> shortcutViews = mShortcutsItemView == null

                ? Collections.EMPTY_LIST

                : mShortcutsItemView.getDeepShortcutViews(reverseOrder);

        if (mNotificationItemView != null) {

            IconPalette iconPalette = originalIcon.getIconPalette();

            mNotificationItemView.applyColors(iconPalette);

                    break;

            }

        }



        // Add the arrow.