From: masensio <masensio@solidgear.es>
Date: Thu, 3 Apr 2014 08:08:57 +0000 (+0200)
Subject: On any device, any orientation, show the icons for Upload and New folder directly... 
X-Git-Tag: oc-android-1.7.0_signed~351^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d164646e289306ae85a2b2b9b3f952c2ddac0fe5?ds=inline;hp=--cc

On any device, any orientation, show the icons for Upload and New folder directly in the bar.
---

d164646e289306ae85a2b2b9b3f952c2ddac0fe5
diff --git a/res/menu-land/main_menu.xml b/res/menu-land/main_menu.xml
deleted file mode 100644
index 6b848263..00000000
--- a/res/menu-land/main_menu.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2012-2014 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,
-  as published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  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" >
-
-    <item
-        android:id="@+id/action_upload"
-        android:icon="@drawable/ic_action_upload"
-        android:orderInCategory="2"
-        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|withText"
-        android:title="@string/actionbar_mkdir"/>
-    <item
-        android:id="@+id/action_sync_account"
-        android:icon="@drawable/ic_action_refresh"
-        android:orderInCategory="2"
-        android:showAsAction="ifRoom"
-        android:title="@string/actionbar_sync"/>
-    <item
-        android:id="@+id/action_settings"
-        android:icon="@drawable/ic_action_settings"
-        android:orderInCategory="2"
-        android:showAsAction="ifRoom"
-        android:title="@string/actionbar_settings"/>
-
-</menu>
\ No newline at end of file
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index f30382e1..979d7309 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -23,25 +23,25 @@
         android:id="@+id/action_upload"
         android:icon="@drawable/ic_action_upload"
         android:orderInCategory="2"
-        android:showAsAction="ifRoom|withText"
+        android:showAsAction="always"
         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|withText"
+        android:showAsAction="always"
         android:title="@string/actionbar_mkdir"/>
     <item
         android:id="@+id/action_sync_account"
         android:icon="@drawable/ic_action_refresh"
         android:orderInCategory="2"
-        android:showAsAction="ifRoom"
+        android:showAsAction="never"
         android:title="@string/actionbar_sync"/>
     <item
         android:id="@+id/action_settings"
         android:icon="@drawable/ic_action_settings"
         android:orderInCategory="2"
-        android:showAsAction="ifRoom"
+        android:showAsAction="never"
         android:title="@string/actionbar_settings"/>
 
     <!-- <item android:id="@+id/search" android:title="@string/actionbar_search" android:icon="@drawable/ic_action_search"></item> -->