Merge branch 'develop' into setup_buttons

diff --combined res/layout-land/account_setup.xml
index c672362,15e872b..1025bcf
--- 1/res/layout-land/account_setup.xml
--- 2/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@@ -37,6 -37,7 +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
@@@ -186,26 -187,29 +187,26 @@@
        </LinearLayout>\r
         \r
        <Button\r
 -              android:id="@id/buttonOK"\r
 -              android:layout_width="match_parent"\r
 -              android:layout_height="wrap_content"\r
 -              android:background="@android:drawable/btn_default"\r
 -              android:layout_above="@id/account_register"\r
 -              android:layout_centerHorizontal="true"\r
 -              android:enabled="false"\r
 -              android:onClick="onOkClick"\r
 -              android:text="@string/setup_btn_connect"\r
 -              />\r
 +          android:id="@id/buttonOK"\r
 +          android:layout_width="match_parent"\r
 +          android:layout_height="wrap_content"\r
 +          android:layout_above="@+id/welcome_link"\r
 +          android:layout_centerHorizontal="true"\r
 +          android:enabled="false"\r
 +          android:onClick="onOkClick"\r
 +          android:text="@string/setup_btn_connect" />\r
  \r
        <Button\r
 -              android:id="@+id/account_register"\r
 -              android:layout_width="wrap_content"\r
 -              android:layout_height="wrap_content"\r
 -              android:layout_centerHorizontal="true"\r
 -              android:layout_alignParentBottom="true"\r
 -              android:background="@android:color/transparent"\r
 -              android:textColor="#0000FF"\r
 -              android:onClick="onRegisterClick"\r
 -              android:paddingTop="5dp"\r
 -              android:paddingBottom="5dp"\r
 -              android:text="@string/auth_register" \r
 -              />\r
 +          android:id="@id/welcome_link"\r
 +          android:layout_width="wrap_content"\r
 +          android:layout_height="wrap_content"\r
 +          android:layout_alignParentBottom="true"\r
 +          android:layout_centerHorizontal="true"\r
 +          android:background="@android:color/transparent"\r
 +          android:onClick="onRegisterClick"\r
 +          android:paddingBottom="5dp"\r
 +          android:paddingTop="5dp"\r
 +          android:text="@string/auth_register"\r
 +          android:textColor="#0000FF"/>\r
        \r
  </RelativeLayout>\r

diff --combined res/layout/account_setup.xml
index 52afe54,810e083..d147780
--- 1/res/layout/account_setup.xml
--- 2/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@@ -40,6 -40,7 +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
@@@ -170,22 -171,24 +171,22 @@@
              android:id="@+id/buttonOK"\r
              android:layout_width="match_parent"\r
              android:layout_height="wrap_content"\r
 -            android:background="@android:drawable/btn_default"\r
              android:layout_gravity="center_horizontal"\r
              android:enabled="false"\r
              android:onClick="onOkClick"\r
 -            android:text="@string/setup_btn_connect"\r
 -            />\r
 +            android:text="@string/setup_btn_connect" />\r
  \r
          <Button\r
 -            android:id="@+id/account_register"\r
 +            android:id="@+id/welcome_link"\r
              android:layout_width="wrap_content"\r
              android:layout_height="wrap_content"\r
              android:background="@android:color/transparent"\r
 -            android:textColor="#0000FF" \r
              android:onClick="onRegisterClick"\r
              android:paddingBottom="5dp"\r
              android:paddingTop="5dp"\r
              android:text="@string/auth_register"\r
 -            />\r
 +            android:textColor="#0000FF"/>\r
 +\r
      </LinearLayout>\r
  \r
  </ScrollView>

diff --combined res/values/setup.xml
index 2092c3f,31df6da..a2fb403
--- 1/res/values/setup.xml
--- 2/res/values/setup.xml
+++ b/res/values/setup.xml
@@@ -9,10 -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>
 -      <string name="url_account_register">"https://owncloud.com/mobile/new"</string>
 +    <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,13 -20,11 +21,14 @@@
      
      <!-- 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>
      
 +    <!-- Button -->
 +    <color name="button_text_color">#000000</color>
 +    
      <!-- Multiaccount support -->
      <bool name="multiaccount_support">true</bool>
      
@@@ -43,4 -41,3 +45,4 @@@
  
  </resources>
  
 +

diff --combined src/com/owncloud/android/authentication/AuthenticatorActivity.java
index f6c21e2,53f18bb..8f7fc2c
--- 1/src/com/owncloud/android/authentication/AuthenticatorActivity.java
--- 2/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -49,6 -49,7 +49,6 @@@ import android.widget.CheckBox
  import android.widget.EditText;\r
  import android.widget.TextView;\r
  import android.widget.TextView.OnEditorActionListener;\r
 -import android.widget.Toast;\r
  \r
  import com.actionbarsherlock.app.SherlockDialogFragment;\r
  import com.owncloud.android.Log_OC;\r
@@@ -68,7 -69,6 +68,7 @@@ import com.owncloud.android.ui.dialog.S
  import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r
  import com.owncloud.android.utils.OwnCloudVersion;\r
  \r
 +\r
  import eu.alefzero.webdav.WebdavClient;\r
  \r
  /**\r
@@@ -193,16 -193,11 +193,16 @@@ implements  OnRemoteOperationListener, 
          /// set Host Url Input Enabled\r
          mHostUrlInputEnabled = getResources().getBoolean(R.bool.show_server_url_input);\r
          \r
 -\r
 -        /// complete label for 'register account' button\r
 -        Button b = (Button) findViewById(R.id.account_register);\r
 -        if (b != null) {\r
 -            b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));\r
 +        /// set visibility of link for new users\r
 +        boolean accountRegisterVisibility = getResources().getBoolean(R.bool.show_welcome_link);\r
 +        Button welcomeLink = (Button) findViewById(R.id.welcome_link);\r
 +        if (welcomeLink != null) {\r
 +            if (accountRegisterVisibility) {\r
 +                welcomeLink.setVisibility(View.VISIBLE);\r
 +                welcomeLink.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));            \r
 +            } else {\r
 +                findViewById(R.id.welcome_link).setVisibility(View.GONE);\r
 +            }\r
          }\r
  \r
          /// initialization\r
@@@ -1402,7 -1397,7 +1402,7 @@@
       * @param view      'Account register' button\r
       */\r
      public void onRegisterClick(View view) {\r
--        Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_account_register)));\r
++        Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.welcome_link_url)));\r
          setResult(RESULT_CANCELED);\r
          startActivity(register);\r
      }\r