Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...

diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 0f7328a,0e8ba48..a21205a
--- 1/src/com/owncloud/android/authentication/AuthenticatorActivity.java
--- 2/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -229,12 -229,8 +229,11 @@@ implements  OnRemoteOperationListener, 
                  }\r
                  mHostBaseUrl = normalizeUrl(mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL));\r
                  mHostUrlInput.setText(mHostBaseUrl);\r
 +                String userName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));\r
 +                mUsernameInput.setText(userName);\r
 +                mAccountNameInput.setText(userName);\r
              }\r
              initAuthorizationMethod();  // checks intent and setup.xml to determine mCurrentAuthorizationMethod\r
-             mOAuth2Check.setChecked(mCurrentAuthTokenType == AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN);\r
              mJustCreated = true;\r
              \r
              if (mAction == ACTION_UPDATE_TOKEN || !mHostUrlInputEnabled) {\r