PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-02 01:18:50 +00:00
committed by Android (Google) Code Review
parent 6c82867a7e 3ce144b41b
commit 7a0010d20e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/popup/PopupContainerWithArrow.java
+8 -8
View File
@@ -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:
IconPalette iconPalette = originalIcon.getIconPalette();
mNotificationItemView.applyColors(iconPalette);
break;
}
List<DeepShortcutView> shortcutViews = mShortcutsItemView == null
? Collections.EMPTY_LIST
: mShortcutsItemView.getDeepShortcutViews(reverseOrder);
if (mNotificationItemView != null) {
IconPalette iconPalette = originalIcon.getIconPalette();
mNotificationItemView.applyColors(iconPalette);
}
// Add the arrow.