From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 28 Oct 2013 11:52:20 +0000 (+0100)
Subject: Merge branch 'develop' into review_build_process
X-Git-Tag: oc-android-1.5.5~140^2~11
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/586ef8ad2d3e8f16bcaffe1f9152db1eaa7a11fe?hp=dde58b6e673683844be625df19f16b50d4f1ab53

Merge branch 'develop' into review_build_process
---

diff --git a/res/values/setup.xml b/res/values/setup.xml
index cc816d15..8fbd4ed3 100644
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@ -9,9 +9,10 @@
     <string name ="data_folder">owncloud</string>
     <string name ="log_name">Owncloud_</string>
     
-    <!-- Server URL -->
+    <!-- URLs and flags related -->
     <string name="server_url"></string>
     <bool name="show_server_url_input">true</bool>
+	<string name="url_account_register">"https://owncloud.com/mobile/new"</string>
     
     <!-- Flags to setup the authentication methods available in the app -->
     <string name="auth_method_oauth2">off</string>
diff --git a/res/values/urls.xml b/res/values/urls.xml
deleted file mode 100644
index 98d2ddd2..00000000
--- a/res/values/urls.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  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 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
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<resources>
-    <string name="url_account_register">"https://owncloud.com/mobile/new"</string>
-</resources>
\ No newline at end of file
diff --git a/setup_env.bat b/setup_env.bat
index 85f45086..30176009 100644
--- a/setup_env.bat
+++ b/setup_env.bat
@@ -1,8 +1,6 @@
-git submodule init
-git submodule update
-call android.bat update project -p actionbarsherlock\library --target 1
-call android.bat update project -p . --target 1
+call git submodule init
+call git submodule update
+call android.bat update project -p actionbarsherlock\library -n ActionBarSherlock
+call android.bat update project -p .
 copy /Y third_party\android-support-library\android-support-v4.jar actionbarsherlock\library\libs\android-support-v4.jar
-cd tests
-call android.bat update test-project -m .. -p .
-cd ..
+call android.bat update test-project -p tests -m ..
diff --git a/setup_env.sh b/setup_env.sh
index 78babf13..d64b46c2 100755
--- a/setup_env.sh
+++ b/setup_env.sh
@@ -2,8 +2,7 @@
 
 git submodule init
 git submodule update
-android update project -p actionbarsherlock/library
+android update project -p actionbarsherlock/library -n ActionBarSherlock
 android update project -p .
 cp third_party/android-support-library/android-support-v4.jar actionbarsherlock/library/libs/android-support-v4.jar 
-cd tests
-android update test-project -m .. -p .
+android update test-project -p tests -m ..