From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 29 May 2015 11:46:30 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/navigationDrawer_basic' into navigationDrawer_basic
X-Git-Tag: oc-android-1.7.2~1^2~23^2~23
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/41b5eb13b123ab749c7715866a2d526c16e386cd?hp=d84314068663e317ab48d757a42f61163d04ce99

Merge remote-tracking branch 'origin/navigationDrawer_basic' into navigationDrawer_basic
---

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 932aa1ab..27873a61 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -93,7 +93,7 @@
 						android:drawablePadding="5dp"
 						android:paddingRight="55dp"
 						android:contentDescription="@string/auth_host_address"
-						android:textColor="@color/textColor">
+						>
 						<requestFocus />
 					</EditText>
 					<ImageButton
@@ -167,7 +167,7 @@
 					android:hint="@string/auth_username"
 					android:inputType="textNoSuggestions"
 					android:contentDescription="@string/auth_username"
-					android:textColor="@color/textColor" />
+					/>
 		
 				<EditText
 				    android:id="@+id/account_password"
@@ -178,7 +178,7 @@
 					android:inputType="textPassword"
 					android:drawablePadding="5dp"
 					android:contentDescription="@string/auth_password"
-					android:textColor="@color/textColor" />
+					/>
 		        
 				<TextView
 					android:id="@+id/auth_status_text"
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index dd51f639..6b9ce79f 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -81,7 +81,7 @@
 				android:drawablePadding="5dp"
 				android:paddingRight="55dp"
 				android:contentDescription="@string/auth_host_address"
-                android:textColor="@color/textColor">
+                >
 				<requestFocus />
 			</EditText>
 			<ImageButton
@@ -153,7 +153,7 @@
             android:hint="@string/auth_username"
             android:inputType="textNoSuggestions"
             android:contentDescription="@string/auth_username"
-            android:textColor="@color/textColor" />
+            />
 
 		<EditText
 		    android:id="@+id/account_password"
@@ -164,7 +164,7 @@
 		    android:hint="@string/auth_password"
 		    android:inputType="textPassword"
 		    android:contentDescription="@string/auth_password"
-            android:textColor="@color/textColor" />
+            />
         
         <TextView
             android:id="@+id/auth_status_text"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7007fa35..0d3f14df 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -27,13 +27,11 @@
     	<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
 	</style>
 	
-	<style name="Theme.ownCloud.noActionBar" parent="style/Theme.AppCompat">
+	<style name="Theme.ownCloud.noActionBar" parent="style/Theme.AppCompat.Light">
         <item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
     </style>
 
 	<style name="Theme.ownCloud.Fullscreen" parent="style/Theme.AppCompat">
-        <item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
-        <item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
         <item name="android:windowFullscreen">true</item>
     </style>