Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update

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

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index b2973a0..1f712ee 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/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
@@ -41,7 +41,8 @@
             android:layout_marginBottom="10dp"\r
             android:layout_marginTop="10dp"\r
             android:background="@color/login_logo_background_color"\r
-            android:src="@drawable/logo" />\r
+            android:src="@drawable/logo"\r
+            android:contentDescription="@string/app_name"/>\r
 \r
         <Button\r
             android:id="@+id/centeredRefreshButton"\r
@@ -51,7 +52,8 @@
             android:layout_marginBottom="10dp"\r
             android:onClick="onRefreshClick"\r
             android:text="@string/auth_check_server"\r
-            android:visibility="gone" />\r
+            android:visibility="gone"\r
+            android:contentDescription="@string/auth_check_server"/>\r
         \r
         <TextView\r
             android:id="@+id/instructions_message"\r
@@ -60,7 +62,8 @@
             android:layout_gravity="fill_horizontal"\r
             android:text="@string/auth_expired_basic_auth_toast"\r
             android:visibility="gone"\r
-            android:layout_marginBottom="10dp" />\r
+            android:layout_marginBottom="10dp"\r
+            android:contentDescription="@string/auth_expired_basic_auth_toast"/>\r
 \r
            <FrameLayout \r
                android:id="@+id/hostUrlFrame"\r
@@ -77,6 +80,7 @@
                                android:inputType="textUri"\r
                                android:drawablePadding="5dp"\r
                                android:paddingRight="55dp"\r
+                               android:contentDescription="@string/auth_host_address"\r
                                >\r
                                <requestFocus />\r
                        </EditText>\r
@@ -92,6 +96,7 @@
                android:onClick="onRefreshClick"\r
                                android:visibility="gone"\r
                                android:background="@android:color/transparent"\r
+                android:contentDescription="@string/auth_refresh_button"\r
                            />\r
                </FrameLayout>\r
 \r
@@ -103,7 +108,8 @@
             android:drawableLeft="@android:drawable/stat_notify_sync"\r
             android:drawablePadding="5dp"\r
             android:gravity="center_vertical"\r
-            android:text="@string/auth_testing_connection" />\r
+            android:text="@string/auth_testing_connection"\r
+            android:contentDescription="@string/auth_testing_connection"/>\r
 \r
         <CheckBox\r
             android:id="@+id/oauth_onOff_check"\r
@@ -113,6 +119,7 @@
             android:onClick="onCheckClick"\r
             android:text="@string/oauth_check_onoff"\r
             android:textAppearance="?android:attr/textAppearanceSmall"\r
+            android:contentDescription="@string/oauth_check_onoff"\r
             />\r
 \r
         <EditText\r
@@ -124,7 +131,7 @@
             android:text="@string/oauth2_url_endpoint_auth"\r
             android:singleLine="true"\r
             android:inputType="textUri"\r
-            android:visibility="gone" >\r
+            android:visibility="gone">\r
         </EditText>\r
 \r
         <EditText\r
@@ -136,7 +143,7 @@
             android:text="@string/oauth2_url_endpoint_access"\r
             android:singleLine="true"\r
             android:inputType="textUri"\r
-            android:visibility="gone" />\r
+            android:visibility="gone"/>\r
 \r
         <EditText\r
             android:id="@+id/account_username"\r
@@ -144,7 +151,8 @@
             android:layout_height="wrap_content"\r
             android:ems="10"\r
             android:hint="@string/auth_username"\r
-            android:inputType="textNoSuggestions" \r
+            android:inputType="textNoSuggestions"\r
+            android:contentDescription="@string/auth_username"\r
                        />\r
 \r
                <EditText\r
@@ -154,7 +162,8 @@
                    android:drawablePadding="5dp"\r
                    android:ems="10"\r
                    android:hint="@string/auth_password"\r
-                   android:inputType="textPassword" \r
+                   android:inputType="textPassword"\r
+                   android:contentDescription="@string/auth_password"\r
             />\r
         \r
         <TextView\r
@@ -165,7 +174,8 @@
             android:drawableLeft="@android:drawable/stat_notify_sync"\r
             android:drawablePadding="5dp"\r
             android:gravity="center_vertical"\r
-            android:text="@string/auth_unauthorized" />\r
+            android:text="@string/auth_unauthorized"\r
+            android:contentDescription="@string/auth_unauthorized"/>\r
 \r
         <Button\r
             android:id="@+id/buttonOK"\r
@@ -174,7 +184,8 @@
             android:layout_gravity="center_horizontal"\r
             android:enabled="false"\r
             android:onClick="onOkClick"\r
-            android:text="@string/setup_btn_connect" />\r
+            android:text="@string/setup_btn_connect"\r
+            android:contentDescription="@string/setup_btn_connect"/>\r
 \r
         <Button\r
             android:id="@+id/welcome_link"\r
@@ -185,7 +196,8 @@
             android:paddingBottom="5dp"\r
             android:paddingTop="5dp"\r
             android:text="@string/auth_register"\r
-            android:textColor="#0000FF"/>\r
+            android:textColor="#0000FF"\r
+            android:contentDescription="@string/auth_register"/>\r
 \r
     </LinearLayout>\r
 \r