From: David A. Velasco Date: Wed, 19 Jun 2013 15:56:46 +0000 (+0200) Subject: Merge branch 'develop'after SPRINT-002 X-Git-Tag: oc-android-1.4.3~12^2~6 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/63a3522ab7c8940ccc48be09e2247f86cbf60598?hp=9d24b7ca537d44cff3a5adb84e3801ce102c92ad Merge branch 'develop'after SPRINT-002 Conflicts: .classpath --- diff --git a/.classpath b/.classpath index 0b084083..7bc01d9a 100644 --- a/.classpath +++ b/.classpath @@ -1,9 +1,9 @@ - - + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 0ff9ee10..81acefee 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,7 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e5e4a059..ee9ecafd 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,174 +1,182 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/THIRD_PARTY.txt b/THIRD_PARTY.txt index 1d51b72a..d85eb899 100644 --- a/THIRD_PARTY.txt +++ b/THIRD_PARTY.txt @@ -11,9 +11,8 @@ ########### 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 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 @@ -45,7 +44,7 @@ The third party software included and used by this project is: Original license document included at libs/LICENSE.txt See http://jackrabbit.apache.org/ - * Transifex client.JavaMail API, version 1.4.3 + * Transifex client. Copyright (C) Transifex. Licensed under GNU General Public License. Placed at third_party/transifex-client. diff --git a/doc/CodeStyleFormatter.xml b/doc/CodeStyleFormatter.xml index af0006c6..ce1e4347 100644 --- a/doc/CodeStyleFormatter.xml +++ b/doc/CodeStyleFormatter.xml @@ -1,16 +1,17 @@ - + + - + - + @@ -23,11 +24,11 @@ - + - + @@ -50,7 +51,7 @@ - + @@ -72,8 +73,8 @@ - - + + @@ -81,14 +82,14 @@ - + - + - + @@ -101,7 +102,7 @@ - + @@ -119,11 +120,11 @@ - + - + @@ -149,21 +150,21 @@ - + - + - + - + @@ -181,15 +182,15 @@ - + - + - + @@ -204,7 +205,7 @@ - + @@ -216,16 +217,16 @@ - + - - + + - + - + @@ -233,10 +234,10 @@ - + - + @@ -246,16 +247,16 @@ - + - - + + - - + + @@ -277,7 +278,7 @@ - + diff --git a/lint.xml b/lint.xml new file mode 100644 index 00000000..ee0eead5 --- /dev/null +++ b/lint.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/oc_jb_workaround/.classpath b/oc_jb_workaround/.classpath index 3f9691c5..96e9275b 100644 --- a/oc_jb_workaround/.classpath +++ b/oc_jb_workaround/.classpath @@ -1,8 +1,9 @@ - - + + + diff --git a/oc_jb_workaround/project.properties b/oc_jb_workaround/project.properties index 9b84a6b4..a3ee5ab6 100644 --- a/oc_jb_workaround/project.properties +++ b/oc_jb_workaround/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-16 +target=android-17 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/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-v9/ic_action_download.png b/res/drawable-hdpi-v9/ic_action_download.png new file mode 100644 index 00000000..25476cd7 Binary files /dev/null and b/res/drawable-hdpi-v9/ic_action_download.png differ diff --git a/res/drawable-hdpi/ic_action_download.png b/res/drawable-hdpi/ic_action_download.png new file mode 100644 index 00000000..05e75b4b Binary files /dev/null and b/res/drawable-hdpi/ic_action_download.png differ diff --git a/res/drawable-hdpi/logo.png b/res/drawable-hdpi/logo.png new file mode 100644 index 00000000..ecea3b0e Binary files /dev/null and b/res/drawable-hdpi/logo.png differ diff --git a/res/drawable-hdpi/owncloud_logo.png b/res/drawable-hdpi/owncloud_logo.png deleted file mode 100644 index ecea3b0e..00000000 Binary files a/res/drawable-hdpi/owncloud_logo.png and /dev/null differ diff --git a/res/drawable-ldpi-v9/ic_action_download.png b/res/drawable-ldpi-v9/ic_action_download.png new file mode 100644 index 00000000..41fe95a4 Binary files /dev/null and b/res/drawable-ldpi-v9/ic_action_download.png differ diff --git a/res/drawable-ldpi/ic_action_download.png b/res/drawable-ldpi/ic_action_download.png new file mode 100644 index 00000000..7293d6da Binary files /dev/null and b/res/drawable-ldpi/ic_action_download.png differ diff --git a/res/drawable-ldpi/logo.png b/res/drawable-ldpi/logo.png new file mode 100644 index 00000000..62dff255 Binary files /dev/null and b/res/drawable-ldpi/logo.png differ diff --git a/res/drawable-ldpi/owncloud_logo.png b/res/drawable-ldpi/owncloud_logo.png deleted file mode 100644 index 62dff255..00000000 Binary files a/res/drawable-ldpi/owncloud_logo.png and /dev/null differ diff --git a/res/drawable-mdpi-v9/ic_action_download.png b/res/drawable-mdpi-v9/ic_action_download.png new file mode 100644 index 00000000..2684c83f Binary files /dev/null and b/res/drawable-mdpi-v9/ic_action_download.png differ diff --git a/res/drawable-mdpi/ic_action_download.png b/res/drawable-mdpi/ic_action_download.png new file mode 100644 index 00000000..afb2cb2e Binary files /dev/null and b/res/drawable-mdpi/ic_action_download.png differ diff --git a/res/drawable-mdpi/logo.png b/res/drawable-mdpi/logo.png new file mode 100644 index 00000000..ecea3b0e Binary files /dev/null and b/res/drawable-mdpi/logo.png differ diff --git a/res/drawable-mdpi/owncloud_logo.png b/res/drawable-mdpi/owncloud_logo.png deleted file mode 100644 index ecea3b0e..00000000 Binary files a/res/drawable-mdpi/owncloud_logo.png and /dev/null 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_cancel.png b/res/drawable/btn_cancel.png new file mode 100644 index 00000000..0a339bde Binary files /dev/null and b/res/drawable/btn_cancel.png differ 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/ic_hide.png b/res/drawable/ic_hide.png new file mode 100644 index 00000000..8a8144b5 Binary files /dev/null and b/res/drawable/ic_hide.png differ diff --git a/res/drawable/ic_view.png b/res/drawable/ic_view.png new file mode 100644 index 00000000..b57c2499 Binary files /dev/null and b/res/drawable/ic_view.png differ 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 c45405fa..dea86cd9 100644 --- a/res/layout-land/account_setup.xml +++ b/res/layout-land/account_setup.xml @@ -1,14 +1,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -