Changes due to CR

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

src/main/java/com/owncloud/android/ui/activity/FileActivity.java

@@ -173,9 +173,9 @@ public abstract class FileActivity extends DrawerActivity
         // must be specialized in subclasses
         MainApp.showOnlyFilesOnDevice(onDeviceOnly);
         if (onDeviceOnly) {
-            setupHomeSearchToolbar(true);
+            setupToolbar();
         } else {
-            setupHomeSearchToolbar(true);
+            setupHomeSearchToolbarWithSortAndListButtons();
         }
     }
 

src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -245,7 +245,7 @@ public class FileDisplayActivity extends FileActivity
         setContentView(binding.getRoot());
 
         // setup toolbar
-        setupHomeSearchToolbar(true);
+        setupHomeSearchToolbarWithSortAndListButtons();
 
         mMenuButton.setOnClickListener(v -> openDrawer());
 
@@ -1132,16 +1132,16 @@ public class FileDisplayActivity extends FileActivity
         if (menuItemId == -1) {
             if (MainApp.isOnlyOnDevice()) {
                 setDrawerMenuItemChecked(R.id.nav_on_device);
-                setupHomeSearchToolbar(true);
+                setupToolbar();
             } else {
                 setDrawerMenuItemChecked(R.id.nav_all_files);
-                setupHomeSearchToolbar(true);
+                setupHomeSearchToolbarWithSortAndListButtons();
             }
         } else {
             if (menuItemId == R.id.nav_all_files) {
-                setupHomeSearchToolbar(true);
+                setupHomeSearchToolbarWithSortAndListButtons();
             } else {
-                setupHomeSearchToolbar(true);
+                setupToolbar();
             }
             setDrawerMenuItemChecked(menuItemId);
         }

src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java

@@ -122,12 +122,8 @@ public abstract class ToolbarActivity extends BaseActivity {
         setupToolbar(false, false);
     }
 
-    public void setupHomeSearchToolbar() {
-        setupToolbar(true, false);
-    }
-
-    public void setupHomeSearchToolbar(boolean showShortListGroup) {
-        setupToolbar(true, showShortListGroup);
+    public void setupHomeSearchToolbarWithSortAndListButtons() {
+        setupToolbar(true, true);
     }
 
     /**