From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 4 Aug 2015 14:42:17 +0000 (+0200)
Subject: Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_... 
X-Git-Tag: oc-android-1.8~42^2~42
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2636e07289924b4e2ff6853b4a7d3cbde2a0d149?hp=f9a370e7e688ccf7452ede22cf2fff9dfad9450d

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

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 6b898740..d5d6ab0f 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -76,8 +76,8 @@
 				    android:text="@string/auth_expired_basic_auth_toast" 
 				    android:visibility="gone"
 				    android:layout_marginBottom="10dp"
-					android:textColor="#AAAAAA"
-					android:textColorHint="#AAAAAA"
+					android:textColor="@color/login_text_color"
+					android:textColorHint="@color/login_text_hint_color"
                     android:contentDescription="@string/auth_expired_basic_auth_toast"/>
 			    <FrameLayout 
 	        		android:id="@+id/hostUrlFrame"
@@ -94,8 +94,8 @@
 						android:inputType="textUri"
 						android:drawablePadding="5dp"
 						android:paddingRight="55dp"
-						android:textColor="#AAAAAA"
-						android:textColorHint="#AAAAAA"
+						android:textColor="@color/login_text_color"
+						android:textColorHint="@color/login_text_hint_color"
 						android:contentDescription="@string/auth_host_address"
 						>
 						<requestFocus />
@@ -124,8 +124,8 @@
 					android:drawableLeft="@android:drawable/stat_notify_sync"
 					android:drawablePadding="5dp"
 					android:gravity="center_vertical"
-					android:textColor="#AAAAAA"
-					android:textColorHint="#AAAAAA"
+					android:textColor="@color/login_text_color"
+					android:textColorHint="@color/login_text_hint_color"
 					android:text="@string/auth_testing_connection"
                     android:contentDescription="@string/auth_testing_connection"/>
 		             
@@ -136,8 +136,8 @@
 					android:checked="false"
 					android:onClick="onCheckClick"
 					android:text="@string/oauth_check_onoff"
-					android:textColor="#AAAAAA"
-					android:textColorHint="#AAAAAA"
+					android:textColor="@color/login_text_color"
+					android:textColorHint="@color/login_text_hint_color"
 					android:textAppearance="?android:attr/textAppearanceSmall"
                     android:contentDescription="@string/oauth_check_onoff"
 					/>
@@ -151,8 +151,8 @@
 					android:text="@string/oauth2_url_endpoint_auth"
 					android:singleLine="true"
 					android:inputType="textUri"
-					android:textColor="#AAAAAA"
-					android:textColorHint="#AAAAAA"
+					android:textColor="@color/login_text_color"
+					android:textColorHint="@color/login_text_hint_color"
 					android:visibility="gone">
 				</EditText>            
 				
@@ -165,8 +165,8 @@
 					android:text="@string/oauth2_url_endpoint_access"
 					android:singleLine="true"
 					android:inputType="textUri"
-					android:textColor="#AAAAAA"
-					android:textColorHint="#AAAAAA"
+					android:textColor="@color/login_text_color"
+					android:textColorHint="@color/login_text_hint_color"
 					android:visibility="gone">
 					<requestFocus />
 				</EditText>            
@@ -178,8 +178,8 @@
 					android:ems="10"
 					android:hint="@string/auth_username"
 					android:inputType="textNoSuggestions"
-					android:textColor="#AAAAAA"
-					android:textColorHint="#AAAAAA"
+					android:textColor="@color/login_text_color"
+					android:textColorHint="@color/login_text_hint_color"
 					android:contentDescription="@string/auth_username"
 					/>
 		
@@ -191,8 +191,8 @@
 					android:hint="@string/auth_password"
 					android:inputType="textPassword"
 					android:drawablePadding="5dp"
-					android:textColor="#AAAAAA"
-					android:textColorHint="#AAAAAA"
+					android:textColor="@color/login_text_color"
+					android:textColorHint="@color/login_text_hint_color"
 					android:contentDescription="@string/auth_password"
 					/>
 		        
@@ -204,8 +204,8 @@
 					android:text="@string/auth_unauthorized"
 					android:drawableLeft="@android:drawable/stat_notify_sync"
 					android:drawablePadding="5dip"
-					android:textColor="#AAAAAA"
-					android:textColorHint="#AAAAAA"
+					android:textColor="@color/login_text_color"
+					android:textColorHint="@color/login_text_hint_color"
                     android:contentDescription="@string/auth_unauthorized"
 					/>
 
@@ -242,7 +242,7 @@
 		    android:paddingBottom="5dp"
 		    android:paddingTop="5dp"
 		    android:text="@string/auth_register"
-			android:textColor="#AAAAAA"
+			android:textColor="@color/login_text_color"
             android:contentDescription="@string/auth_register"/>
 	</LinearLayout>