fix for refresh bug

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 2fcc1d0..c9b8cb9 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -107,7 +107,7 @@
                                            android:layout_marginRight="5dp"\r
                                            android:padding="0dp"\r
                                            android:scaleType="fitCenter"\r
                                            android:layout_marginRight="5dp"\r
                                            android:padding="0dp"\r
                                            android:scaleType="fitCenter"\r

-                                           android:src="@drawable/ic_action_refresh_black"\r
+                                           android:src="@drawable/ic_action_refresh_grey"\r

                                android:onClick="onRefreshClick"\r
                                            android:visibility="gone"\r
                                                android:background="@android:color/transparent"\r
                                android:onClick="onRefreshClick"\r
                                            android:visibility="gone"\r
                                                android:background="@android:color/transparent"\r


@@ -126,6 +126,7 @@
                                        android:textColor="@color/login_text_color"\r
                                        android:textColorHint="@color/login_text_hint_color"\r
                                        android:text="@string/auth_testing_connection"\r
                                        android:textColor="@color/login_text_color"\r
                                        android:textColorHint="@color/login_text_hint_color"\r
                                        android:text="@string/auth_testing_connection"\r

+                                       android:minHeight="32dp"\r

                     android:contentDescription="@string/auth_testing_connection"/>\r
                             \r
                                <CheckBox\r
                     android:contentDescription="@string/auth_testing_connection"/>\r
                             \r
                                <CheckBox\r

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 0789c59..7ac0f36 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -96,7 +96,6 @@
                            android:padding="0dp"\r
                            android:scaleType="fitCenter"\r
                            android:src="@drawable/ic_action_refresh_grey"\r
                            android:padding="0dp"\r
                            android:scaleType="fitCenter"\r
                            android:src="@drawable/ic_action_refresh_grey"\r

-               android:onClick="onRefreshClick"\r

                                android:visibility="gone"\r
                                android:background="@android:color/transparent"\r
                 android:contentDescription="@string/auth_refresh_button"\r
                                android:visibility="gone"\r
                                android:background="@android:color/transparent"\r
                 android:contentDescription="@string/auth_refresh_button"\r


@@ -114,6 +113,7 @@
             android:textColor="@color/login_text_color"\r
             android:textColorHint="@color/login_text_hint_color"\r
             android:text="@string/auth_testing_connection"\r
             android:textColor="@color/login_text_color"\r
             android:textColorHint="@color/login_text_hint_color"\r
             android:text="@string/auth_testing_connection"\r

+            android:minHeight="32dp"\r

             android:contentDescription="@string/auth_testing_connection"/>\r
 \r
         <CheckBox\r
             android:contentDescription="@string/auth_testing_connection"/>\r
 \r
         <CheckBox\r

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 3db9b7a..73bd6e4 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -176,7 +176,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private EditText mUsernameInput;\r
     private EditText mPasswordInput;\r
     private View mOkButton;\r
     private EditText mUsernameInput;\r
     private EditText mPasswordInput;\r
     private View mOkButton;\r

-    private View mCenteredRefreshButton;\r

     private TextView mAuthStatusView;\r
 \r
     private int mAuthStatusText = 0, mAuthStatusIcon = 0;\r
     private TextView mAuthStatusView;\r
 \r
     private int mAuthStatusText = 0, mAuthStatusIcon = 0;\r


@@ -261,26 +260,15 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             }\r
         });\r
 \r
             }\r
         });\r
 \r

-        mCenteredRefreshButton = findViewById(R.id.centeredRefreshButton);\r
-        mCenteredRefreshButton.setOnClickListener(new View.OnClickListener() {\r
+        findViewById(R.id.centeredRefreshButton).setOnClickListener(new View.OnClickListener() {\r

 \r
             @Override\r
             public void onClick(View v) {\r
                 checkOcServer();\r
             }\r
         });\r
 \r
             @Override\r
             public void onClick(View v) {\r
                 checkOcServer();\r
             }\r
         });\r

-        \r
-        mOkButton = findViewById(R.id.buttonOK);\r
-        mOkButton.setOnClickListener(new View.OnClickListener() {\r
-\r
-            @Override\r
-            public void onClick(View v) {\r
-                onOkClick();\r
-            }\r
-        });\r

 \r
 \r

-        mCenteredRefreshButton = findViewById(R.id.centeredRefreshButton);\r
-        mCenteredRefreshButton.setOnClickListener(new View.OnClickListener() {\r
+        findViewById(R.id.embeddedRefreshButton).setOnClickListener(new View.OnClickListener() {\r

 \r
             @Override\r
             public void onClick(View v) {\r
 \r
             @Override\r
             public void onClick(View v) {\r