From 53592d1f57a10243950c6cec9cbb2486574c2a27 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Fri, 1 Oct 2021 17:41:14 -0400
Subject: [PATCH] Don't bury sort menu in overflow in Migrate screen

(cherry picked from commit edb1d21ddc311d65a45f6720fa20cb0017e9bda9)
---
 app/src/main/res/menu/browse_migrate.xml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/menu/browse_migrate.xml b/app/src/main/res/menu/browse_migrate.xml
index 1d1d557b3..eb6e06f9f 100644
--- a/app/src/main/res/menu/browse_migrate.xml
+++ b/app/src/main/res/menu/browse_migrate.xml
@@ -1,16 +1,12 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item
-        android:id="@+id/action_source_migration_help"
-        android:icon="@drawable/ic_help_24dp"
-        android:title="@string/migration_help_guide"
-        app:iconTint="?attr/colorOnToolbar"
-        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_sort"
+        android:icon="@drawable/ic_sort_24dp"
         android:title="@string/action_sort"
-        app:showAsAction="never">
+        app:iconTint="?attr/colorOnToolbar"
+        app:showAsAction="collapseActionView|ifRoom" >
         <menu>
             <item
                 android:id="@+id/action_sort_alphabetical"
@@ -41,4 +37,11 @@
         </menu>
     </item>
 
+    <item
+        android:id="@+id/action_source_migration_help"
+        android:icon="@drawable/ic_help_24dp"
+        android:title="@string/migration_help_guide"
+        app:iconTint="?attr/colorOnToolbar"
+        app:showAsAction="ifRoom" />
+
 </menu>