Merge branch 'develop' into review_build_process

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 9b80057..15e872b 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -37,6 +37,7 @@
                        android:layout_height="wrap_content"\r
                        android:layout_weight="1"\r
                        android:layout_gravity="center"\r
+                       android:background="@color/login_logo_background_color"\r
                        android:src="@drawable/logo" \r
                        />\r
                \r

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 543627d..810e083 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -40,6 +40,7 @@
             android:layout_height="wrap_content"\r
             android:layout_marginBottom="10dp"\r
             android:layout_marginTop="10dp"\r
+            android:background="@color/login_logo_background_color"\r
             android:src="@drawable/logo" />\r
 \r
         <Button\r

diff --git a/res/values/setup.xml b/res/values/setup.xml
index cc816d1..31df6da 100644 (file)
--- 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>
@@ -19,6 +20,7 @@
     
     <!-- Colors -->
     <color name="login_background_color">#FFFFFF</color>
+    <color name="login_logo_background_color">#FFFFFF</color>
     <color name="background_color">#F7F7F7</color>
     <color name="actionbar_start_color">#1D2D44</color>
     <color name="actionbar_end_color">#1D2D44</color>

diff --git a/res/values/urls.xml b/res/values/urls.xml
deleted file mode 100644 (file)
index 98d2ddd..0000000
--- 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 85f4508..3017600 100644 (file)
--- 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 78babf1..d64b46c 100755 (executable)
--- 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 ..