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

[pub/Android/ownCloud.git] / res / layout-land / account_setup.xml

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 9170782..d5d6ab0 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -3,7 +3,7 @@
   ownCloud Android client application\r
 \r
   Copyright (C) 2012  Bartek Przybylski\r
-  Copyright (C) 2012-2013 ownCloud Inc.\r
+  Copyright (C) 2015 ownCloud Inc.\r
 \r
   This program is free software: you can redistribute it and/or modify\r
   it under the terms of the GNU General Public License version 2,\r
@@ -32,7 +32,7 @@
         android:orientation="horizontal" >\r
         \r
                <ImageView\r
-                       android:id="@+id/imageView1"\r
+                       android:id="@+id/thumbnail"\r
                        android:layout_width="0dp"\r
                        android:layout_height="wrap_content"\r
                        android:layout_weight="1"\r
@@ -76,6 +76,8 @@
                                    android:text="@string/auth_expired_basic_auth_toast" \r
                                    android:visibility="gone"\r
                                    android:layout_marginBottom="10dp"\r
+                                       android:textColor="@color/login_text_color"\r
+                                       android:textColorHint="@color/login_text_hint_color"\r
                     android:contentDescription="@string/auth_expired_basic_auth_toast"/>\r
                            <FrameLayout \r
                                android:id="@+id/hostUrlFrame"\r
@@ -92,6 +94,8 @@
                                                android:inputType="textUri"\r
                                                android:drawablePadding="5dp"\r
                                                android:paddingRight="55dp"\r
+                                               android:textColor="@color/login_text_color"\r
+                                               android:textColorHint="@color/login_text_hint_color"\r
                                                android:contentDescription="@string/auth_host_address"\r
                                                >\r
                                                <requestFocus />\r
@@ -120,6 +124,8 @@
                                        android:drawableLeft="@android:drawable/stat_notify_sync"\r
                                        android:drawablePadding="5dp"\r
                                        android:gravity="center_vertical"\r
+                                       android:textColor="@color/login_text_color"\r
+                                       android:textColorHint="@color/login_text_hint_color"\r
                                        android:text="@string/auth_testing_connection"\r
                     android:contentDescription="@string/auth_testing_connection"/>\r
                             \r
@@ -130,6 +136,8 @@
                                        android:checked="false"\r
                                        android:onClick="onCheckClick"\r
                                        android:text="@string/oauth_check_onoff"\r
+                                       android:textColor="@color/login_text_color"\r
+                                       android:textColorHint="@color/login_text_hint_color"\r
                                        android:textAppearance="?android:attr/textAppearanceSmall"\r
                     android:contentDescription="@string/oauth_check_onoff"\r
                                        />\r
@@ -143,6 +151,8 @@
                                        android:text="@string/oauth2_url_endpoint_auth"\r
                                        android:singleLine="true"\r
                                        android:inputType="textUri"\r
+                                       android:textColor="@color/login_text_color"\r
+                                       android:textColorHint="@color/login_text_hint_color"\r
                                        android:visibility="gone">\r
                                </EditText>            \r
                                \r
@@ -155,6 +165,8 @@
                                        android:text="@string/oauth2_url_endpoint_access"\r
                                        android:singleLine="true"\r
                                        android:inputType="textUri"\r
+                                       android:textColor="@color/login_text_color"\r
+                                       android:textColorHint="@color/login_text_hint_color"\r
                                        android:visibility="gone">\r
                                        <requestFocus />\r
                                </EditText>            \r
@@ -166,7 +178,10 @@
                                        android:ems="10"\r
                                        android:hint="@string/auth_username"\r
                                        android:inputType="textNoSuggestions"\r
-                                       android:contentDescription="@string/auth_username"/>\r
+                                       android:textColor="@color/login_text_color"\r
+                                       android:textColorHint="@color/login_text_hint_color"\r
+                                       android:contentDescription="@string/auth_username"\r
+                                       />\r
                \r
                                <EditText\r
                                    android:id="@+id/account_password"\r
@@ -176,6 +191,8 @@
                                        android:hint="@string/auth_password"\r
                                        android:inputType="textPassword"\r
                                        android:drawablePadding="5dp"\r
+                                       android:textColor="@color/login_text_color"\r
+                                       android:textColorHint="@color/login_text_hint_color"\r
                                        android:contentDescription="@string/auth_password"\r
                                        />\r
                        \r
@@ -187,6 +204,8 @@
                                        android:text="@string/auth_unauthorized"\r
                                        android:drawableLeft="@android:drawable/stat_notify_sync"\r
                                        android:drawablePadding="5dip"\r
+                                       android:textColor="@color/login_text_color"\r
+                                       android:textColorHint="@color/login_text_hint_color"\r
                     android:contentDescription="@string/auth_unauthorized"\r
                                        />\r
 \r
@@ -223,7 +242,7 @@
                    android:paddingBottom="5dp"\r
                    android:paddingTop="5dp"\r
                    android:text="@string/auth_register"\r
-                   android:textColor="#0000FF"\r
+                       android:textColor="@color/login_text_color"\r
             android:contentDescription="@string/auth_register"/>\r
        </LinearLayout>\r
                \r