Fix hamburger menu item order (#2842)

MozillaReality · Feb 24, 2020 · cb836f1 · cb836f1
1 parent 600d2f0
commit cb836f1
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/menus/HamburgerMenuWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/menus/HamburgerMenuWidget.java
@@ -12,7 +12,7 @@
 import org.mozilla.vrbrowser.utils.AnimationHelper;
 
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Optional;
 
 public class HamburgerMenuWidget extends MenuWidget {
@@ -29,7 +29,7 @@ public interface MenuDelegate {
     public static final int WINDOW_RESIZE = 1;
     public static final int SWITCH_MODE = 2;
 
-    HashMap<Integer, MenuItem> mItems;
+    LinkedHashMap<Integer, MenuItem> mItems;
     @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
     Optional<MenuDelegate> mMenuDelegate;
     boolean mSendTabEnabled = true;
@@ -110,20 +110,19 @@ public void setMenuDelegate(MenuDelegate delegate) {
 
     @SuppressLint("UseSparseArrays")
     private void updateMenuItems() {
-        mItems = new HashMap<>();
+        mItems = new LinkedHashMap<>();
 
+        mItems.put(WINDOW_RESIZE,
+                new MenuItem(getContext().getString(R.string.hamburger_menu_resize),
+                        R.drawable.ic_icon_resize,
+                        () -> mMenuDelegate.ifPresent(MenuDelegate::onResize)));
         if (mSendTabEnabled) {
             mItems.put(SEND_TAB,
                     new MenuItem(getContext().getString(R.string.hamburger_menu_send_tab),
                             R.drawable.ic_icon_tabs_sendtodevice,
                             () -> mMenuDelegate.ifPresent(MenuDelegate::onSendTab)));
         }
 
-        mItems.put(WINDOW_RESIZE,
-                new MenuItem(getContext().getString(R.string.hamburger_menu_resize),
-                        R.drawable.ic_icon_resize,
-                        () -> mMenuDelegate.ifPresent(MenuDelegate::onResize)));
-
         mItems.put(SWITCH_MODE,
                 new MenuItem(getContext().getString(R.string.hamburger_menu_switch_to_desktop),
                         R.drawable.ic_icon_ua_default,