From: David A. Velasco Date: Thu, 25 Apr 2013 17:39:22 +0000 (+0200) Subject: Merge branch 'develop' into oauth_login X-Git-Tag: oc-android-1.4.3~29^2~4 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2946d8dd69cf8d30a3fc2447ac931675989e8eff?hp=2e5b40e357a5ab18b3a04f823b7cd27d5c94dc90 Merge branch 'develop' into oauth_login Conflicts: AndroidManifest.xml res/values/strings.xml src/com/owncloud/android/Uploader.java src/com/owncloud/android/authentication/AccountAuthenticator.java src/com/owncloud/android/authenticator/AuthenticationRunnable.java src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java src/com/owncloud/android/authenticator/OnConnectCheckListener.java src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java src/com/owncloud/android/files/services/FileDownloader.java src/com/owncloud/android/files/services/FileOperation.java src/com/owncloud/android/files/services/FileUploader.java src/com/owncloud/android/network/OwnCloudClientUtils.java src/com/owncloud/android/operations/RemoteOperationResult.java src/com/owncloud/android/operations/UpdateOCVersionOperation.java src/com/owncloud/android/syncadapter/FileSyncAdapter.java src/com/owncloud/android/ui/activity/AccountSelectActivity.java src/com/owncloud/android/ui/activity/AuthenticatorActivity.java src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/fragment/FileDetailFragment.java src/eu/alefzero/webdav/WebdavClient.java --- diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 745d09f3..ba32f6cf 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,155 +1,166 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - + + + + - - diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..5d0c02f2 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,39 @@ +## Submitting issues + +If you have questions about how to use ownCloud, please direct these to the [mailing list][mailinglist] or our [forum][forum]. We are also available on [IRC][irc]. + +### Guidelines +* [Report the issue](https://github.com/owncloud/android/issues/new) using our [template][template], it includes all the informations we need to track down the issue. +* This repository is *only* for issues within the ownCloud Android app code. Issues in other compontents should be reported in their own repositores: + - [ownCloud code](https://github.com/owncloud/core/issues) + - [iOS client](https://github.com/owncloud/ios-issues/issues) + - [Desktop client](https://github.com/owncloud/mirall/issues) + - [ownCloud apps](https://github.com/owncloud/apps/issues) (e.g. Calendar, Contacts...) +* Search the existing issues first, it's likely that your issue was already reported. + +If your issue appears to be a bug, and hasn't been reported, open a new issue. + +Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues. + +[template]: https://raw.github.com/owncloud/android/master/issue_template.md +[mailinglist]: https://mail.kde.org/mailman/listinfo/owncloud +[forum]: http://forum.owncloud.org/ +[irc]: http://webchat.freenode.net/?channels=owncloud&uio=d4 + +## Contributing to Source Code + +Thanks for wanting to contribute source code to ownCloud. That's great! + +Before we're able to merge your code into the ownCloud app for Android, you need to sign our [Contributor Agreement][agreement]. + +### Guidelines +* Contribute your code in the branch 'develop'. It will give us a better chance to test your code before merging it with stable code. +* For your first contribution, start a pull request on develop and send us the signed [Contributor Agreement][agreement]. +* Keep on using pull requests for your next contributions although you own write permissions. + +[agreement]: http://owncloud.org/about/contributor-agreement/ + +## Translations +Please submit translations via [Transifex][transifex]. + +[transifex]: https://www.transifex.com/projects/p/owncloud/ diff --git a/LICENSE.txt b/LICENSE.txt index d159169d..4fc88098 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -294,10 +294,9 @@ the "copyright" line and a pointer to where the full notice is found. Copyright (C) This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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 diff --git a/README.md b/README.md new file mode 100644 index 00000000..3ba9f73a --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ +This is the android client for [owncloud][0]. + +Make sure you read [SETUP.md][1] when you start working on this project. + +[0]: https://github.com/owncloud/core +[1]: https://raw.github.com/owncloud/android/master/SETUP.md \ No newline at end of file diff --git a/README.setup b/README.setup deleted file mode 100644 index 3d592e06..00000000 --- a/README.setup +++ /dev/null @@ -1,13 +0,0 @@ -If you want to start development of ownCloud android client you have two way to do so -(a) building with console -(b) building with eclipse - -1. Use setup_env.sh -2a. ant clean;ant debug -2b. Open Eclipse and import actionbarsherlock/library project to your workspace - -after those space you should be good to go. - -HAVE FUN! - -NOTE: You must have 'tools' and 'platforms-tools' in your path in order to run setup_env.sh diff --git a/SETUP.md b/SETUP.md new file mode 100644 index 00000000..d527d4fe --- /dev/null +++ b/SETUP.md @@ -0,0 +1,23 @@ + + If you want to start development of ownCloud android client you have two way to do so: + + 1. Building with console: + + - Use setup_env.sh or setup_env.bat + - NOTE: You must have git, ant/bin, android/tools in your enviroment path + + 2. Building with eclipse: + + - Run ant clean debug + - Open Eclipse and import *actionbarsherlock/library* project to your workspace + - NOTE: You must have 'tools' and 'platforms-tools' in your path in order to run setup_env.sh + + After those actions you should be good to go. + + HAVE FUN! + + + + + + diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt new file mode 100644 index 00000000..1cfdddc8 --- /dev/null +++ b/THIRD_PARTY.txt @@ -0,0 +1,63 @@ +################################################################### + ownCloud Android client + + Copyright (C) 2012-2013 ownCloud Inc. + Copyright (C) 2012 Bartek Przybylski +################################################################### + + +########### +# LICENSE # +########### + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License verions 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. + +The source distribution of this program should include a full copy +of the GNU GPL version 2 license in the LICENSE.txt file located +in its root directory. If not, see . + + +######################## +# THIRD PARTY LICENSES # +######################## + +Both the source and binary distributions of this software contain +some third party software. All the third party software included +or linked is redistributed under the terms and conditions of their +original licenses. These licenses are compatible the GPL license +that govern this software, for the purposes they are being used. + +The third party software included and used by this project is: + + * Apache JackRabbit, version 2.2.5. + Copyright (C) 2004-2010 The Apache Software Foundation. + Licensed under Apache License, Version 2.0. + Placed at libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar + The jar file must be included in the ownCloud client APK. + Original license document included at libs/LICENSE.txt + See http://jackrabbit.apache.org/ + + * Transifex client.JavaMail API, version 1.4.3 + Copyright (C) Transifex. + Licensed under GNU General Public License. + Placed at third_party/transifex-client. + Used as a helper tool, not included in the ownCloud client APK. + Original license document included at third_party/transifex-client/LICENSE. + See http://help.transifex.com/features/client/ + + * ActionBarSherlock, master branch. + Copyright (C) 2012 Jake Wharton. + Licensed under Apache License, Version 2.0. + The official repository is linked as a submodule in the + ownCloud/android repository. + A binary JAR file must be generated from this linked project + and included in the ownCloud client APK. + See http://http://actionbarsherlock.com/ + \ No newline at end of file diff --git a/doc/CodeStyleFormatter.xml b/doc/CodeStyleFormatter.xml new file mode 100644 index 00000000..af0006c6 --- /dev/null +++ b/doc/CodeStyleFormatter.xml @@ -0,0 +1,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/issue_template.md b/issue_template.md new file mode 100644 index 00000000..493572d2 --- /dev/null +++ b/issue_template.md @@ -0,0 +1,32 @@ +### Expected behaviour +Tell us what should happen + +### Actual behaviour +Tell us what happens instead + +### Steps to reproduce +1. +2. +3. + +### Environment data +Android version: + +Device model: + +Stock or customized system: + +ownCloud app version: + +ownCloud server version: + +### Logs +#### Web server error log +``` +Insert your webserver log here +``` + +#### ownCloud log (data/owncloud.log) +``` +Insert your ownCloud log here +``` diff --git a/oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java b/oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java index 102f2be6..9b2922e3 100644 --- a/oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java +++ b/oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java @@ -2,9 +2,8 @@ * Copyright (C) 2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * 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 diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..27263337 --- /dev/null +++ b/pom.xml @@ -0,0 +1,100 @@ + + + + 4.0.0 + com.owncloud.android + owncloud + 1.3.21-SNAPSHOT + apk + Owncloud Android + + + 1.6 + 4.1.1.4 + r7 + 4.2.0 + + + https://github.com/owncloud/android + Owncloud for Android + + scm:git:git@github.com:owncloud/android.git + scm:git:git@github.com:owncloud/android.git + https://github.com/owncloud/android + + + + + + com.google.android + android + ${google.android-version} + provided + + + + com.google.android + support-v4 + ${google.android.support-version} + + + + com.actionbarsherlock + actionbarsherlock + ${actionbarsherlock-version} + provided + + + + com.actionbarsherlock + actionbarsherlock + ${actionbarsherlock-version} + apklib + + + + org.apache.jackrabbit + jackrabbit-webdav + 2.5.2 + + + + + + ${project.artifactId} + + src + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.0 + + ${java-version} + ${java-version} + + + + + com.jayway.maven.plugins.android.generation2 + android-maven-plugin + 3.5.0 + + + + ${env.ANDROID_HOME} + 17 + + + true + + + + + + + + diff --git a/res/anim/disappear.xml b/res/anim/disappear.xml index 1c98f627..8bb865d9 100644 --- a/res/anim/disappear.xml +++ b/res/anim/disappear.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/anim/grow_from_bottom.xml b/res/anim/grow_from_bottom.xml index f02d8680..78bd62b3 100644 --- a/res/anim/grow_from_bottom.xml +++ b/res/anim/grow_from_bottom.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/anim/grow_from_bottomleft_to_topright.xml b/res/anim/grow_from_bottomleft_to_topright.xml index 963cfe5c..32b251b4 100644 --- a/res/anim/grow_from_bottomleft_to_topright.xml +++ b/res/anim/grow_from_bottomleft_to_topright.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/anim/grow_from_bottomright_to_topleft.xml b/res/anim/grow_from_bottomright_to_topleft.xml index d7536342..f92b219a 100644 --- a/res/anim/grow_from_bottomright_to_topleft.xml +++ b/res/anim/grow_from_bottomright_to_topleft.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/anim/grow_from_top.xml b/res/anim/grow_from_top.xml index 2dfe4dbb..851f8477 100644 --- a/res/anim/grow_from_top.xml +++ b/res/anim/grow_from_top.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/anim/grow_from_topleft_to_bottomright.xml b/res/anim/grow_from_topleft_to_bottomright.xml index 8cef01b9..951ca014 100644 --- a/res/anim/grow_from_topleft_to_bottomright.xml +++ b/res/anim/grow_from_topleft_to_bottomright.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/anim/grow_from_topright_to_bottomleft.xml b/res/anim/grow_from_topright_to_bottomleft.xml index 902f41ef..972a5b7a 100644 --- a/res/anim/grow_from_topright_to_bottomleft.xml +++ b/res/anim/grow_from_topright_to_bottomleft.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/anim/pump_bottom.xml b/res/anim/pump_bottom.xml index 05827899..6016e000 100644 --- a/res/anim/pump_bottom.xml +++ b/res/anim/pump_bottom.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/anim/pump_top.xml b/res/anim/pump_top.xml index 6766ea75..fa0b6c9c 100644 --- a/res/anim/pump_top.xml +++ b/res/anim/pump_top.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/anim/shrink_from_bottom.xml b/res/anim/shrink_from_bottom.xml index 517d36c8..c330980a 100644 --- a/res/anim/shrink_from_bottom.xml +++ b/res/anim/shrink_from_bottom.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/anim/shrink_from_bottomleft_to_topright.xml b/res/anim/shrink_from_bottomleft_to_topright.xml index c91455e9..086eab3c 100644 --- a/res/anim/shrink_from_bottomleft_to_topright.xml +++ b/res/anim/shrink_from_bottomleft_to_topright.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/anim/shrink_from_bottomright_to_topleft.xml b/res/anim/shrink_from_bottomright_to_topleft.xml index 7ad975bc..c96ea9a4 100644 --- a/res/anim/shrink_from_bottomright_to_topleft.xml +++ b/res/anim/shrink_from_bottomright_to_topleft.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/anim/shrink_from_top.xml b/res/anim/shrink_from_top.xml index 2c6fed06..4438ebfa 100644 --- a/res/anim/shrink_from_top.xml +++ b/res/anim/shrink_from_top.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/anim/shrink_from_topleft_to_bottomright.xml b/res/anim/shrink_from_topleft_to_bottomright.xml index 98cc67b5..680e8487 100644 --- a/res/anim/shrink_from_topleft_to_bottomright.xml +++ b/res/anim/shrink_from_topleft_to_bottomright.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/anim/shrink_from_topright_to_bottomleft.xml b/res/anim/shrink_from_topright_to_bottomleft.xml index cb1d2928..773b51da 100644 --- a/res/anim/shrink_from_topright_to_bottomleft.xml +++ b/res/anim/shrink_from_topright_to_bottomleft.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/drawable-hdpi/image_fail.png b/res/drawable-hdpi/image_fail.png new file mode 100644 index 00000000..38667417 Binary files /dev/null and b/res/drawable-hdpi/image_fail.png differ diff --git a/res/drawable-ldpi/image_fail.png b/res/drawable-ldpi/image_fail.png new file mode 100644 index 00000000..77513ad2 Binary files /dev/null and b/res/drawable-ldpi/image_fail.png differ diff --git a/res/drawable-mdpi/image_fail.png b/res/drawable-mdpi/image_fail.png new file mode 100644 index 00000000..8e650cd3 Binary files /dev/null and b/res/drawable-mdpi/image_fail.png differ diff --git a/res/drawable/action_item_btn.xml b/res/drawable/action_item_btn.xml index 47f73b22..dd278339 100644 --- a/res/drawable/action_item_btn.xml +++ b/res/drawable/action_item_btn.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/drawable/btn.xml b/res/drawable/btn.xml index b58eda87..0b0a3999 100644 --- a/res/drawable/btn.xml +++ b/res/drawable/btn.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/drawable/btn_round.xml b/res/drawable/btn_round.xml index a2c92aa8..1a47be54 100644 --- a/res/drawable/btn_round.xml +++ b/res/drawable/btn_round.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/drawable/btn_round_pressed.xml b/res/drawable/btn_round_pressed.xml index e567a6bd..bc138c7a 100644 --- a/res/drawable/btn_round_pressed.xml +++ b/res/drawable/btn_round_pressed.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/drawable/connection_secure.xml b/res/drawable/connection_secure.xml index 7b2944f3..3e252d32 100644 --- a/res/drawable/connection_secure.xml +++ b/res/drawable/connection_secure.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/drawable/list_selector.xml b/res/drawable/list_selector.xml index 4af9f6b0..d5881ab8 100644 --- a/res/drawable/list_selector.xml +++ b/res/drawable/list_selector.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/drawable/main_header_bg.xml b/res/drawable/main_header_bg.xml index 166b666d..855ba2c1 100644 --- a/res/drawable/main_header_bg.xml +++ b/res/drawable/main_header_bg.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/drawable/progress_small.xml b/res/drawable/progress_small.xml index 55eb2dd3..12336470 100644 --- a/res/drawable/progress_small.xml +++ b/res/drawable/progress_small.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/drawable/split_action_bg.xml b/res/drawable/split_action_bg.xml index c0b4731b..99219b64 100644 --- a/res/drawable/split_action_bg.xml +++ b/res/drawable/split_action_bg.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/drawable/uploader_list_separator.xml b/res/drawable/uploader_list_separator.xml index f1c174fd..1e53367d 100644 --- a/res/drawable/uploader_list_separator.xml +++ b/res/drawable/uploader_list_separator.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml index ab380ba4..a420ee3f 100644 --- a/res/layout-land/account_setup.xml +++ b/res/layout-land/account_setup.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/layout-large-land/files.xml b/res/layout-large-land/files.xml index 90c5c543..d874bf54 100644 --- a/res/layout-large-land/files.xml +++ b/res/layout-large-land/files.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/layout-v14/generic_explanation.xml b/res/layout-v14/generic_explanation.xml index ccc62d19..4bd3cddb 100644 --- a/res/layout-v14/generic_explanation.xml +++ b/res/layout-v14/generic_explanation.xml @@ -5,9 +5,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml index d4d3abeb..ae3624c2 100644 --- a/res/layout/account_setup.xml +++ b/res/layout/account_setup.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/layout/action_item.xml b/res/layout/action_item.xml index 22847def..09519581 100644 --- a/res/layout/action_item.xml +++ b/res/layout/action_item.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/layout/audio_player.xml b/res/layout/audio_player.xml new file mode 100644 index 00000000..bee0f870 --- /dev/null +++ b/res/layout/audio_player.xml @@ -0,0 +1,29 @@ + + + + + + \ No newline at end of file diff --git a/res/layout/authenticator_getting_started_fragment.xml b/res/layout/authenticator_getting_started_fragment.xml index 3a97615f..5aad7782 100644 --- a/res/layout/authenticator_getting_started_fragment.xml +++ b/res/layout/authenticator_getting_started_fragment.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/layout/edit_box_dialog.xml b/res/layout/edit_box_dialog.xml index 7dd0b3e5..500945b1 100644 --- a/res/layout/edit_box_dialog.xml +++ b/res/layout/edit_box_dialog.xml @@ -6,10 +6,9 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - + 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 diff --git a/res/layout/extensions_available_dialog.xml b/res/layout/extensions_available_dialog.xml index 65dd2b3c..e5c3d105 100644 --- a/res/layout/extensions_available_dialog.xml +++ b/res/layout/extensions_available_dialog.xml @@ -6,9 +6,8 @@ Copyright (C) 2012-2013 ownCloud Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + 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 diff --git a/res/layout/failed_upload_files.xml b/res/layout/failed_upload_files.xml new file mode 100644 index 00000000..0f459a0b --- /dev/null +++ b/res/layout/failed_upload_files.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + +