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 932aa1a..d5d6ab0 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -76,6 +76,8 @@
                                    android:text="@string/auth_expired_basic_auth_toast" \r
                                    android:visibility="gone"\r
                                    android:layout_marginBottom="10dp"\r
                                    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
                     android:contentDescription="@string/auth_expired_basic_auth_toast"/>\r
                            <FrameLayout \r
                                android:id="@+id/hostUrlFrame"\r


@@ -92,8 +94,10 @@
                                                android:inputType="textUri"\r
                                                android:drawablePadding="5dp"\r
                                                android:paddingRight="55dp"\r
                                                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
                                                android:contentDescription="@string/auth_host_address"\r

-                                               android:textColor="@color/textColor">\r
+                                               >\r

                                                <requestFocus />\r
                                        </EditText>\r
                                        <ImageButton\r
                                                <requestFocus />\r
                                        </EditText>\r
                                        <ImageButton\r


@@ -120,6 +124,8 @@
                                        android:drawableLeft="@android:drawable/stat_notify_sync"\r
                                        android:drawablePadding="5dp"\r
                                        android:gravity="center_vertical"\r
                                        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
                                        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: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
                                        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: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
                                        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: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
                                        android:visibility="gone">\r
                                        <requestFocus />\r
                                </EditText>            \r


@@ -166,8 +178,10 @@
                                        android:ems="10"\r
                                        android:hint="@string/auth_username"\r
                                        android:inputType="textNoSuggestions"\r
                                        android:ems="10"\r
                                        android:hint="@string/auth_username"\r
                                        android:inputType="textNoSuggestions"\r

+                                       android:textColor="@color/login_text_color"\r
+                                       android:textColorHint="@color/login_text_hint_color"\r

                                        android:contentDescription="@string/auth_username"\r
                                        android:contentDescription="@string/auth_username"\r

-                                       android:textColor="@color/textColor" />\r
+                                       />\r

                \r
                                <EditText\r
                                    android:id="@+id/account_password"\r
                \r
                                <EditText\r
                                    android:id="@+id/account_password"\r


@@ -177,8 +191,10 @@
                                        android:hint="@string/auth_password"\r
                                        android:inputType="textPassword"\r
                                        android:drawablePadding="5dp"\r
                                        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
                                        android:contentDescription="@string/auth_password"\r

-                                       android:textColor="@color/textColor" />\r
+                                       />\r

                        \r
                                <TextView\r
                                        android:id="@+id/auth_status_text"\r
                        \r
                                <TextView\r
                                        android:id="@+id/auth_status_text"\r


@@ -188,6 +204,8 @@
                                        android:text="@string/auth_unauthorized"\r
                                        android:drawableLeft="@android:drawable/stat_notify_sync"\r
                                        android:drawablePadding="5dip"\r
                                        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
                     android:contentDescription="@string/auth_unauthorized"\r
                                        />\r
 \r


@@ -224,7 +242,7 @@
                    android:paddingBottom="5dp"\r
                    android:paddingTop="5dp"\r
                    android:text="@string/auth_register"\r
                    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
             android:contentDescription="@string/auth_register"/>\r
        </LinearLayout>\r
                \r