projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
delete values-tzl
[pub/Android/ownCloud.git]
/
res
/
menu
/
main_menu.xml
diff --git
a/res/menu/main_menu.xml
b/res/menu/main_menu.xml
index
ab41e4b
..
236bfd6
100644
(file)
--- a/
res/menu/main_menu.xml
+++ b/
res/menu/main_menu.xml
@@
-17,30
+17,40
@@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
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"
<item
android:id="@+id/action_upload"
android:icon="@drawable/ic_action_upload"
android:orderInCategory="2"
- a
ndroid
:showAsAction="always"
+ a
pp
: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: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"
- a
ndroid
:showAsAction="always"
+ a
pp
:showAsAction="always"
android:title="@string/actionbar_mkdir"
android:contentDescription="@string/actionbar_mkdir"/>
<item
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"
+ app:showAsAction="never"
+ android:title="@string/actionbar_sync"
+ android:contentDescription="@string/actionbar_sync"/>
+ <item
android:id="@+id/action_sort"
android:icon="@android:drawable/ic_menu_sort_by_size"
android:orderInCategory="2"
android:id="@+id/action_sort"
android:icon="@android:drawable/ic_menu_sort_by_size"
android:orderInCategory="2"
- a
ndroid:showAsAction="always
"
+ a
pp:showAsAction="never
"
android:title="@string/actionbar_sort"
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> -->
+ <!-- <item android:id="@+id/search"
+ android:title="@string/actionbar_search"
+ android:icon="@drawable/ic_action_search"></item> -->
</menu>
\ No newline at end of file
</menu>
\ No newline at end of file