X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/e9016281bd0ec9d3c2d4dbaf72ed106d0066d06d..17f4419c491fed6dd9d0d8bccdf180e8c8ea41a6:/res/menu/main_menu.xml?ds=sidebyside

diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index 07056010..e3f2fc3f 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -3,7 +3,7 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2012-2013 ownCloud Inc.
+  Copyright (C) 2015 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,
@@ -17,51 +17,33 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/action_upload"
-        android:icon="@drawable/ic_action_upload"
-        android:orderInCategory="2"
-        android:showAsAction="always"
-        android:title="@string/actionbar_upload"
-        android:contentDescription="@string/actionbar_upload"/>
-    <item
         android:id="@+id/action_create_dir"
         android:icon="@drawable/ic_action_create_dir"
-        android:orderInCategory="2"
-        android:showAsAction="always"
+        android:orderInCategory="1"
+        app:showAsAction="never"
         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:orderInCategory="1"
+        app: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:orderInCategory="2"
-        android:showAsAction="never"
+        android:icon="@drawable/ic_sort_variant"
+        android:orderInCategory="1"
+        app:showAsAction="never"
         android:title="@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> -->
+    <!-- <item android:id="@+id/search"
+    android:title="@string/actionbar_search"
+    android:icon="@drawable/ic_action_search"></item> -->
 
 </menu>
\ No newline at end of file