Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update

[pub/Android/ownCloud.git] / res / menu / main_menu.xml

diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index d35eba0..ab41e4b 100644 (file)
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -34,33 +34,12 @@
         android:title="@string/actionbar_mkdir"
         android:contentDescription="@string/actionbar_mkdir"/>
     <item
-        android:id="@+id/action_sync_account"
-        android:icon="@drawable/ic_action_refresh"
-        android:orderInCategory="2"
-        android:showAsAction="never"
-        android:title="@string/actionbar_sync"
-        android:contentDescription="@string/actionbar_sync"/>
-    <item
-        android:id="@+id/action_settings"
-        android:icon="@drawable/ic_action_settings"
-        android:orderInCategory="2"
-        android:showAsAction="never"
-        android:title="@string/actionbar_settings"
-        android:contentDescription="@string/actionbar_settings"/>
-    <item
-        android:id="@+id/action_logger"
-        android:icon="@drawable/ic_action_settings"
-        android:orderInCategory="2"
-        android:showAsAction="never"
-        android:title="@string/actionbar_logger"
-        android:contentDescription="@string/actionbar_logger"/>
-       <item
         android:id="@+id/action_sort"
-        android:icon="@android:drawable/ic_menu_sort_alphabetically"
+        android:icon="@android:drawable/ic_menu_sort_by_size"
         android:orderInCategory="2"
-        android:showAsAction="never"
+        android:showAsAction="always"
         android:title="@string/actionbar_sort"
-        android:contentDescription="@string/actionbar_sort"/>
+        android:contentDescription="@string/actionbar_sort"/>/>
 
     <!-- <item android:id="@+id/search" android:title="@string/actionbar_search" android:icon="@drawable/ic_action_search"></item> -->