Merge "Ensure system shortcut icons always appear in correct order" into ub-launcher3-dorval

2 files changed, 4 insertions, 2 deletions

diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 99c7e754c..d2512def5 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -193,7 +193,7 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra
                 : 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 ef6365b63..1f90bb023 100644
--- a/src/com/android/launcher3/shortcuts/ShortcutsItemView.java
+++ b/src/com/android/launcher3/shortcuts/ShortcutsItemView.java
@@ -151,7 +151,9 @@ public class ShortcutsItemView extends PopupItemView implements View.OnLongClick
     }
 
     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;