From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 22 Oct 2015 11:05:06 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons
X-Git-Tag: beta-20151128~7^2~13
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5c1e6e59bac614ce2b428f949e8ad09022b60080?hp=-c

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

5c1e6e59bac614ce2b428f949e8ad09022b60080
diff --combined res/layout/account_setup.xml
index d5fd3234,3a8655fa..a555e2f0
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@@ -82,7 -82,6 +82,6 @@@
  				android:inputType="textUri"
  				android:drawablePadding="5dp"
  				android:paddingRight="55dp"
-                 android:textColor="@color/primary"
                  android:textColorHint="@color/login_text_hint_color"
  				android:contentDescription="@string/auth_host_address"
                  >
@@@ -97,6 -96,7 +96,6 @@@
  			    android:padding="0dp"
  			    android:scaleType="fitCenter"
  			    android:src="@drawable/ic_action_refresh_grey"
 -            	android:onClick="onRefreshClick"
  				android:visibility="gone"
  				android:background="@android:color/transparent"
                  android:contentDescription="@string/auth_refresh_button"
@@@ -136,7 -136,6 +135,6 @@@
              android:layout_height="wrap_content"
              android:ems="10"
  			android:enabled="false"
-             android:textColor="@color/primary"
              android:textColorHint="@color/login_text_hint_color"
              android:text="@string/oauth2_url_endpoint_auth"
              android:singleLine="true"
@@@ -153,7 -152,6 +151,6 @@@
              android:text="@string/oauth2_url_endpoint_access"
              android:singleLine="true"
              android:inputType="textUri"
-             android:textColor="@color/primary"
              android:textColorHint="@color/login_text_hint_color"
              android:visibility="gone"/>
  
@@@ -164,7 -162,6 +161,6 @@@
              android:ems="10"
              android:hint="@string/auth_username"
              android:inputType="textNoSuggestions"
-             android:textColor="@color/primary"
              android:textColorHint="@color/login_text_hint_color"
              android:contentDescription="@string/auth_username"
              />
@@@ -177,7 -174,6 +173,6 @@@
  		    android:ems="10"
  		    android:hint="@string/auth_password"
  		    android:inputType="textPassword"
-             android:textColor="@color/primary"
              android:textColorHint="@color/login_text_hint_color"
  		    android:contentDescription="@string/auth_password"
              />