David A. Velasco
e6be60679f
Merge branch 'master' into copy
...
Conflicts FIXED:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/FileDownloadFragment.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
2015-09-01 18:35:51 +02:00
Jorge Antonio Diaz-Benito Soriano
dcffd79b60
Tweaks for source 1.5
2015-08-18 15:55:00 +02:00
masensio
9d815b0187
Update buildTools version to 22.0.1
2015-08-04 11:14:51 +02:00
masensio
d77f1d7ec0
Update build.gradle to 1.2.3
2015-08-03 15:07:20 +02:00
AndyScherzinger
d474239b21
initial material design changes for the action bar
2015-07-26 01:49:27 +02:00
masensio
4f2f0ceb80
Add actionBar
2015-05-25 12:39:05 +02:00
masensio
5709757b11
Update gradle - remove actionSherlock
2015-05-21 16:43:34 +02:00
masensio
a496f08717
Remove actionbarsherlock , replace it with Android Support Library (v7)
2015-05-18 12:59:46 +02:00
masensio
d43fbbac6b
[DEV] Remove actionbarsherlock , replace it with Android Support Library (v7)
2015-05-15 11:24:14 +02:00
David A. Velasco
e874789382
Updated Android Gradle plug-in for compatibility with Android Studio 1.0+
2015-01-19 09:58:06 +01:00
Jorge Antonio Diaz-Benito Soriano
9316ce96ac
Update Gradle plugin to 0.14 for compatibility with Android Studio 0.9.0
2014-11-01 16:08:15 +01:00
MMMarcy
2cad715525
Commit for the PR
...
The pull request targets:
1) Introduces Gradle support
2) Updates maven support (even thou the apk generated is not
stable)
3) Updates the setup_env.* scripts to support different building
tools
4) Removes non UTF-8 characters
5) Removes switches on R.id entries (not supported anymore from
ADT >= 14)
6) Introduced a binary dependency (.aar) that replace the actionbarsherlock
sub-module
Remainders:
1) Change the sub-module back to the owncloud android library
once the PR will be merge
2014-10-28 16:09:34 +01:00
