Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update
authortobiasKaminsky <tobias@kaminsky.me>
Thu, 21 May 2015 19:12:44 +0000 (21:12 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Thu, 21 May 2015 19:12:44 +0000 (21:12 +0200)
commit6d4207a06bfa0a1bb19b8d5942b799dadfbbe608
treed9865026cd973ca62485956541424a4317343efc
parentfb095ecc714ad72b0eb464af4d92756e4b14a769
parent07acad20b58883a1f90611c14d3d8d7ddc35e7d5
Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update
22 files changed:
res/layout/files.xml
res/layout/uploader_layout.xml
res/layout/uploader_list_item_layout.xml
res/menu/main_menu.xml
res/values/colors.xml
res/values/strings.xml
res/xml/preferences.xml
src/com/owncloud/android/MainApp.java
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/operations/RefreshFolderOperation.java
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/FolderPickerActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/activity/UploadPathActivity.java
src/com/owncloud/android/ui/activity/Uploader.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
src/com/owncloud/android/utils/BitmapUtils.java