Revert "Add different action bar configuration for landscape and portrait"

This reverts commit 6dde4ddd3a1dd5f8e239f5056d863274ae2196da.

res/menu/main_menu.xml

@@ -3,7 +3,7 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2012-2014 ownCloud Inc.
+  Copyright (C) 2012-2013 ownCloud Inc.
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
@@ -23,13 +23,13 @@
         android:id="@+id/action_upload"
         android:icon="@drawable/ic_action_upload"
         android:orderInCategory="2"
-        android:showAsAction="ifRoom"
+        android:showAsAction="ifRoom|withText"
         android:title="@string/actionbar_upload"/>
     <item
         android:id="@+id/action_create_dir"
         android:icon="@drawable/ic_action_create_dir"
         android:orderInCategory="2"
-        android:showAsAction="ifRoom"
+        android:showAsAction="ifRoom|withText"
         android:title="@string/actionbar_mkdir"/>
     <item
         android:id="@+id/action_sync_account"
@@ -44,4 +44,6 @@
         android:showAsAction="ifRoom"
         android:title="@string/actionbar_settings"/>
 
+    <!-- <item android:id="@+id/search" android:title="@string/actionbar_search" android:icon="@drawable/ic_action_search"></item> -->
+
 </menu>