Ensure system shortcut icons always appear in correct order
- Remove "|| true" that I accidentally left in from testing on a
different CL
- Always reverse system shortcut icons that appear in the header of the
ShortcutsItemView, so they are in priority order from right to left
Bug: 35766387
Change-Id: Ia7ac5a72eb2f6d3795e35bd044c426ef46fc0ccc
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 99c7e75..d2512de 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -193,7 +193,7 @@
: mShortcutsItemView.getDeepShortcutViews(reverseOrder);
List<View> systemShortcutViews = mShortcutsItemView == null
? Collections.EMPTY_LIST
- : mShortcutsItemView.getSystemShortcutViews(reverseOrder || true);
+ : mShortcutsItemView.getSystemShortcutViews(reverseOrder);
if (mNotificationItemView != null) {
BadgeInfo badgeInfo = mLauncher.getPopupDataProvider()
.getBadgeInfoForItem(originalItemInfo);
diff --git a/src/com/android/launcher3/shortcuts/ShortcutsItemView.java b/src/com/android/launcher3/shortcuts/ShortcutsItemView.java
index ef6365b..1f90bb0 100644
--- a/src/com/android/launcher3/shortcuts/ShortcutsItemView.java
+++ b/src/com/android/launcher3/shortcuts/ShortcutsItemView.java
@@ -151,7 +151,9 @@
}
public List<View> getSystemShortcutViews(boolean reverseOrder) {
- if (reverseOrder) {
+ // Always reverse system shortcut icons (in the header)
+ // so they are in priority order from right to left.
+ if (reverseOrder || mSystemShortcutIcons != null) {
Collections.reverse(mSystemShortcutViews);
}
return mSystemShortcutViews;