Merge branch 'develop' into setup_buttons

oc_jb_workaround/AndroidManifest.xml

@@ -10,8 +10,8 @@
 
     <application
         android:allowBackup="false"
-        android:icon="@drawable/oc_workaround_icon"
-        android:label="@string/app_name"
+        android:icon="@drawable/workaround_app_icon"
+        android:label="@string/workaround_app_name"
         android:theme="@style/AppTheme" >
         <service
             android:name=".AccountAuthenticatorService"

oc_jb_workaround/build.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="oc_jb_workaround" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>

oc_jb_workaround/res/values/setup.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="workaround_app_name">ownCloud Jelly Bean Workaround for lost credentials</string>
+    <string name="main_app_name">ownCloud</string>
+    <string name="account_type">owncloud</string>
+    
+</resources>

oc_jb_workaround/res/values/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name">ownCloud Jelly Bean Workaround for lost credentials</string>
-    <string name="oc_app_name">ownCloud</string>
-    
-</resources>

oc_jb_workaround/res/xml/authenticator.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-                       android:accountType="owncloud"
-                       android:icon="@drawable/oc_icon"
-                       android:label="@string/oc_app_name"
-                       android:smallIcon="@drawable/oc_icon">  
+                       android:accountType="@string/account_type"
+                       android:icon="@drawable/main_app_icon"
+                       android:label="@string/main_app_name"
+                       android:smallIcon="@drawable/main_app_icon">  
 </account-authenticator>

res/layout-land/account_setup.xml

@@ -37,6 +37,7 @@
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
 			android:layout_gravity="center"
+			android:background="@color/login_logo_background_color"
 			android:src="@drawable/logo" 
 			/>
 		

res/layout/account_setup.xml

@@ -40,6 +40,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
             android:layout_marginTop="10dp"
+            android:background="@color/login_logo_background_color"
             android:src="@drawable/logo" />
 
         <Button

res/values/setup.xml

@@ -9,10 +9,11 @@
     <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>
     <bool name="show_welcome_link">true</bool>
+	<string name="welcome_link_url">"https://owncloud.com/mobile/new"</string>
     
     <!-- Flags to setup the authentication methods available in the app -->
     <string name="auth_method_oauth2">off</string>
@@ -20,6 +21,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>

res/values/urls.xml

@@ -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>

setup_env.bat

@@ -1,8 +1,7 @@
-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 .
+call android.bat update project -p oc_jb_workaround
 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 ..

setup_env.sh

@@ -2,8 +2,8 @@
 
 git submodule init
 git submodule update
-android update project -p actionbarsherlock/library
+android update project -p actionbarsherlock/library -n ActionBarSherlock
 android update project -p .
+android update project -p oc_jb_workaround
 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 ..

src/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -1402,7 +1402,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
      * @param view      'Account register' button
      */
     public void onRegisterClick(View view) {
-        Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_account_register)));
+        Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.welcome_link_url)));
         setResult(RESULT_CANCELED);
         startActivity(register);
     }