All files -> media --> all files: show sort header

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.java

@@ -37,6 +37,7 @@ import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.operations.CreateFolderOperation;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.events.SearchEvent;
+import com.owncloud.android.utils.ScreenshotTest;
 
 import org.greenrobot.eventbus.EventBus;
 import org.junit.Assert;
@@ -44,6 +45,7 @@ import org.junit.Rule;
 import org.junit.Test;
 
 import androidx.test.espresso.Espresso;
+import androidx.test.espresso.action.ViewActions;
 import androidx.test.espresso.contrib.DrawerActions;
 import androidx.test.espresso.contrib.NavigationViewActions;
 import androidx.test.espresso.intent.rule.IntentsTestRule;
@@ -175,4 +177,31 @@ public class FileDisplayActivityIT extends AbstractOnServerIT {
 
         Espresso.onView(withId(R.id.switch_account_button)).perform(click());
     }
+
+    @Test
+    @ScreenshotTest
+    public void showMediaThenAllFiles() {
+        FileDisplayActivity sut = activityRule.launchActivity(null);
+
+        // open drawer
+        onView(withId(R.id.drawer_layout)).perform(DrawerActions.open());
+
+        // click "all files"
+        onView(withId(R.id.nav_view))
+            .perform(NavigationViewActions.navigateTo(R.id.nav_gallery));
+
+        // wait
+        shortSleep();
+        waitForIdleSync();
+
+        // click "all files"
+        onView(withId(R.id.drawer_layout)).perform(DrawerActions.open());
+        onView(withId(R.id.nav_view)).perform(ViewActions.swipeUp());
+        onView(withId(R.id.nav_view)).perform(NavigationViewActions.navigateTo(R.id.nav_all_files));
+
+        // then compare screenshot
+        shortSleep();
+        shortSleep();
+        screenshot(sut);
+    }
 }

src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -208,7 +208,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
         ADD_GRID_AND_SORT_WITH_SEARCH
     }
 
-    protected MenuItemAddRemove menuItemAddRemoveValue = MenuItemAddRemove.DO_NOTHING;
+    protected MenuItemAddRemove menuItemAddRemoveValue = MenuItemAddRemove.ADD_GRID_AND_SORT_WITH_SEARCH;
 
     private List<MenuItem> mOriginalMenuItems = new ArrayList<>();