Merge branch 'develop' of github.com:owncloud/android into switchListVsGrid
authortobiasKaminsky <tobias@kaminsky.me>
Sun, 23 Aug 2015 16:51:12 +0000 (18:51 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Sun, 23 Aug 2015 16:51:12 +0000 (18:51 +0200)
commit7bd8443c183905a686b8e0c55258c97dcbbbd2fe
tree4efefec95bc7792cb9d0230307d661a0dafcc9e2
parent6af7d56a4250e339ffbfa1711b16bdd0a5e30e5b
parent0c7a9c3e3a0bba9344db08c8c2acf2718b968e92
Merge branch 'develop' of github.com:owncloud/android into switchListVsGrid
icon is now always visible
13 files changed:
owncloud-android-library
res/drawable-hdpi/ic_view_list.png
res/drawable-hdpi/ic_view_module.png
res/drawable-mdpi/ic_view_list.png
res/drawable-mdpi/ic_view_module.png
res/drawable-xhdpi/ic_view_list.png
res/drawable-xhdpi/ic_view_module.png
res/menu/main_menu.xml
res/values/strings.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/utils/DisplayUtils.java