Merge branch 'develop' into setup_buttons

[pub/Android/ownCloud.git] / src / com / owncloud / android / authentication / AuthenticatorActivity.java

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 69872d7..f6e6780 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -63,7 +63,6 @@ import com.owncloud.android.operations.OwnCloudServerCheckOperation;
 import com.owncloud.android.operations.RemoteOperation;\r
 import com.owncloud.android.operations.RemoteOperationResult;\r
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r
 import com.owncloud.android.operations.RemoteOperation;\r
 import com.owncloud.android.operations.RemoteOperationResult;\r
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r

-import com.owncloud.android.ui.CustomButton;\r

 import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
 import com.owncloud.android.ui.dialog.SslValidatorDialog;\r
 import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r
 import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
 import com.owncloud.android.ui.dialog.SslValidatorDialog;\r
 import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r


@@ -188,7 +187,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         mOAuthAuthEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_1);\r
         mOAuthTokenEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_2);\r
         mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check);\r
         mOAuthAuthEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_1);\r
         mOAuthTokenEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_2);\r
         mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check);\r

-        mOkButton = (CustomButton) findViewById(R.id.buttonOK);\r
+        mOkButton = findViewById(R.id.buttonOK);\r

         mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text); \r
         \r
         /// set Host Url Input Enabled\r
         mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text); \r
         \r
         /// set Host Url Input Enabled\r


@@ -200,11 +199,6 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         if (b != null) {\r
             b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));            \r
         }\r
         if (b != null) {\r
             b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));            \r
         }\r

-\r
-//        /// complete background of 'OK' button\r
-//        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);\r
-//        if (customButtons)\r
-//            mOkButton.setBackgroundResource(R.drawable.btn_default);\r

         \r
         /// initialization\r
         mAccountMgr = AccountManager.get(this);\r
         \r
         /// initialization\r
         mAccountMgr = AccountManager.get(this);\r