commit 978faa9d4a6d482e807d39fa608bfcf57c61513d
author Tony Wickham <twickham@google.com> Fri Apr 14 18:07:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 14 18:07:03 2017 +0000
tree 84d93df7af6b91cbb981591d4d0e5f32477c63a6
parent 95e3c0815cd7763a8921d535edb0e69ff7be17f2
parent 50ba921aa8c516754577eedc4017d1b7be95fb3c

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

Change-Id: Ie296f30e81bea966e1cfc88b81b33cbc1b5bf6e0

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

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);

src/com/android/launcher3/shortcuts/ShortcutsItemView.java

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;