Fixed style in log-in activity; should be Light, as before

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 932aa1a..27873a6 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -93,7 +93,7 @@
                                                android:drawablePadding="5dp"\r
                                                android:paddingRight="55dp"\r
                                                android:contentDescription="@string/auth_host_address"\r
-                                               android:textColor="@color/textColor">\r
+                                               >\r
                                                <requestFocus />\r
                                        </EditText>\r
                                        <ImageButton\r
@@ -167,7 +167,7 @@
                                        android:hint="@string/auth_username"\r
                                        android:inputType="textNoSuggestions"\r
                                        android:contentDescription="@string/auth_username"\r
-                                       android:textColor="@color/textColor" />\r
+                                       />\r
                \r
                                <EditText\r
                                    android:id="@+id/account_password"\r
@@ -178,7 +178,7 @@
                                        android:inputType="textPassword"\r
                                        android:drawablePadding="5dp"\r
                                        android:contentDescription="@string/auth_password"\r
-                                       android:textColor="@color/textColor" />\r
+                                       />\r
                        \r
                                <TextView\r
                                        android:id="@+id/auth_status_text"\r

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index dd51f63..6b9ce79 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -81,7 +81,7 @@
                                android:drawablePadding="5dp"\r
                                android:paddingRight="55dp"\r
                                android:contentDescription="@string/auth_host_address"\r
-                android:textColor="@color/textColor">\r
+                >\r
                                <requestFocus />\r
                        </EditText>\r
                        <ImageButton\r
@@ -153,7 +153,7 @@
             android:hint="@string/auth_username"\r
             android:inputType="textNoSuggestions"\r
             android:contentDescription="@string/auth_username"\r
-            android:textColor="@color/textColor" />\r
+            />\r
 \r
                <EditText\r
                    android:id="@+id/account_password"\r
@@ -164,7 +164,7 @@
                    android:hint="@string/auth_password"\r
                    android:inputType="textPassword"\r
                    android:contentDescription="@string/auth_password"\r
-            android:textColor="@color/textColor" />\r
+            />\r
         \r
         <TextView\r
             android:id="@+id/auth_status_text"\r

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7007fa3..0d3f14d 100644 (file)
--- 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>