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

Commit 96ab9d2c authored by Tony's avatar Tony Committed by android-build-merger
Browse files

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

am: 7a0010d2

Change-Id: Ia89cbcec58fbfbf509187538a51ffa68d3353467
parents 2dcd0ad9 7a0010d2

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.