From: Philippe MARASSE <philippe.marasse@laposte.net>
Date: Mon, 17 Mar 2014 21:14:07 +0000 (+0100)
Subject: updated menu from github comments
X-Git-Tag: oc-android-1.7.0_signed~352^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/28ef4217e56e2db9805af6153ebd074a7a85488b?ds=inline

updated menu from github comments
---

diff --git a/res/drawable-hdpi-v9/ic_action_settings.png b/res/drawable-hdpi-v9/ic_action_settings.png
new file mode 100644
index 00000000..86b54f4c
Binary files /dev/null and b/res/drawable-hdpi-v9/ic_action_settings.png differ
diff --git a/res/drawable-hdpi/ic_action_settings.png b/res/drawable-hdpi/ic_action_settings.png
new file mode 100644
index 00000000..999d0f0d
Binary files /dev/null and b/res/drawable-hdpi/ic_action_settings.png differ
diff --git a/res/drawable-ldpi-v9/ic_action_settings.png b/res/drawable-ldpi-v9/ic_action_settings.png
new file mode 100644
index 00000000..e2c2d517
Binary files /dev/null and b/res/drawable-ldpi-v9/ic_action_settings.png differ
diff --git a/res/drawable-ldpi/ic_action_settings.png b/res/drawable-ldpi/ic_action_settings.png
new file mode 100644
index 00000000..c290e590
Binary files /dev/null and b/res/drawable-ldpi/ic_action_settings.png differ
diff --git a/res/drawable-mdpi-v9/ic_action_settings.png b/res/drawable-mdpi-v9/ic_action_settings.png
new file mode 100644
index 00000000..47ef3f44
Binary files /dev/null and b/res/drawable-mdpi-v9/ic_action_settings.png differ
diff --git a/res/drawable-mdpi/ic_action_settings.png b/res/drawable-mdpi/ic_action_settings.png
new file mode 100644
index 00000000..0eb78f7c
Binary files /dev/null and b/res/drawable-mdpi/ic_action_settings.png differ
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index 7c7ed11d..f30382e1 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -20,11 +20,11 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item
-        android:id="@+id/action_sync_account"
-        android:icon="@drawable/ic_action_refresh"
+        android:id="@+id/action_upload"
+        android:icon="@drawable/ic_action_upload"
         android:orderInCategory="2"
         android:showAsAction="ifRoom|withText"
-        android:title="@string/actionbar_sync"/>
+        android:title="@string/actionbar_upload"/>
     <item
         android:id="@+id/action_create_dir"
         android:icon="@drawable/ic_action_create_dir"
@@ -32,16 +32,16 @@
         android:showAsAction="ifRoom|withText"
         android:title="@string/actionbar_mkdir"/>
     <item
-        android:id="@+id/action_upload"
-        android:icon="@drawable/ic_action_upload"
+        android:id="@+id/action_sync_account"
+        android:icon="@drawable/ic_action_refresh"
         android:orderInCategory="2"
-        android:showAsAction="ifRoom|withText"
-        android:title="@string/actionbar_upload"/>
+        android:showAsAction="ifRoom"
+        android:title="@string/actionbar_sync"/>
     <item
         android:id="@+id/action_settings"
-        android:icon="@android:drawable/ic_menu_preferences"
+        android:icon="@drawable/ic_action_settings"
         android:orderInCategory="2"
-        android:showAsAction="ifRoom|withText"
+        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> -->