Merge branch 'master' of https://github.com/owncloud/android into material_buttons

diff --combined res/layout/account_setup.xml
index d5fd323,3a8655f..a555e2f
--- 1/res/layout/account_setup.xml
--- 2/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@@ -82,7 -82,6 +82,6 @@@
                                android:inputType="textUri"\r
                                android:drawablePadding="5dp"\r
                                android:paddingRight="55dp"\r
-                 android:textColor="@color/primary"\r
                  android:textColorHint="@color/login_text_hint_color"\r
                                android:contentDescription="@string/auth_host_address"\r
                  >\r
@@@ -97,6 -96,7 +96,6 @@@
                            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
@@@ -136,7 -136,6 +135,6 @@@
              android:layout_height="wrap_content"\r
              android:ems="10"\r
                        android:enabled="false"\r
-             android:textColor="@color/primary"\r
              android:textColorHint="@color/login_text_hint_color"\r
              android:text="@string/oauth2_url_endpoint_auth"\r
              android:singleLine="true"\r
@@@ -153,7 -152,6 +151,6 @@@
              android:text="@string/oauth2_url_endpoint_access"\r
              android:singleLine="true"\r
              android:inputType="textUri"\r
-             android:textColor="@color/primary"\r
              android:textColorHint="@color/login_text_hint_color"\r
              android:visibility="gone"/>\r
  \r
@@@ -164,7 -162,6 +161,6 @@@
              android:ems="10"\r
              android:hint="@string/auth_username"\r
              android:inputType="textNoSuggestions"\r
-             android:textColor="@color/primary"\r
              android:textColorHint="@color/login_text_hint_color"\r
              android:contentDescription="@string/auth_username"\r
              />\r
@@@ -177,7 -174,6 +173,6 @@@
                    android:ems="10"\r
                    android:hint="@string/auth_password"\r
                    android:inputType="textPassword"\r
-             android:textColor="@color/primary"\r
              android:textColorHint="@color/login_text_hint_color"\r
                    android:contentDescription="@string/auth_password"\r
              />\r