Added content description tag in 'account setup' layout elements

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 88b1ab3..b0f84df 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -38,7 +38,8 @@
                        android:layout_weight="1"\r
                        android:layout_gravity="center"\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
                \r
                <ScrollView\r
@@ -65,7 +66,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
                                <TextView\r
                                    android:id="@+id/instructions_message"\r
                                    android:layout_width="wrap_content"\r
@@ -73,7 +75,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
                            <FrameLayout \r
                                android:id="@+id/hostUrlFrame"\r
                                        android:layout_width="match_parent"\r
@@ -104,6 +107,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
@@ -115,7 +119,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
@@ -125,6 +130,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
@@ -136,7 +142,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
@@ -148,7 +154,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
                                        <requestFocus />\r
                                </EditText>            \r
                \r
@@ -158,7 +164,7 @@
                                        android:layout_height="wrap_content"\r
                                        android:ems="10"\r
                                        android:hint="@string/auth_username"\r
-                                       android:inputType="textNoSuggestions" />\r
+                                       android:inputType="textNoSuggestions"/>\r
                \r
                                <EditText\r
                                    android:id="@+id/account_password"\r
@@ -178,6 +184,7 @@
                                        android:text="@string/auth_unauthorized"\r
                                        android:drawableLeft="@android:drawable/stat_notify_sync"\r
                                        android:drawablePadding="5dip"\r
+                    android:contentDescription="@string/auth_unauthorized"\r
                                        />\r
 \r
                        </LinearLayout>\r
@@ -200,7 +207,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
@@ -212,7 +220,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
        </LinearLayout>\r
                \r
 </RelativeLayout>\r

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index e3321f9..2f9f98e 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -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
@@ -92,6 +95,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 +107,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 +118,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 +130,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 +142,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 +150,7 @@
             android:layout_height="wrap_content"\r
             android:ems="10"\r
             android:hint="@string/auth_username"\r
-            android:inputType="textNoSuggestions" \r
+            android:inputType="textNoSuggestions"\r
                        />\r
 \r
                <EditText\r
@@ -154,7 +160,7 @@
                    android:drawablePadding="5dp"\r
                    android:ems="10"\r
                    android:hint="@string/auth_password"\r
-                   android:inputType="textPassword" \r
+                   android:inputType="textPassword"\r
             />\r
         \r
         <TextView\r
@@ -165,7 +171,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 +181,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 +193,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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2ea02db..310edd5 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -325,4 +325,6 @@
 
        <string name="prefs_instant_video_upload_path_title">Upload Video Path</string>
 
+    <string name="auth_refresh_button">Refresh connection</string>
+
 </resources>