From 6f11fa1c099493b884a9fc267a6a5985e770b8fc Mon Sep 17 00:00:00 2001
From: jabarros <jabarros@solidgear.es>
Date: Thu, 18 Dec 2014 12:22:07 +0100
Subject: [PATCH] Added content description tag in 'account setup' layout
 elements

---
 res/layout-land/account_setup.xml | 27 ++++++++++++++++++---------
 res/layout/account_setup.xml      | 31 ++++++++++++++++++++-----------
 res/values/strings.xml            |  2 ++
 3 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 88b1ab3c..b0f84dfb 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -38,7 +38,8 @@
 			android:layout_weight="1"
 			android:layout_gravity="center"
 			android:background="@color/login_logo_background_color"
-			android:src="@drawable/logo" 
+			android:src="@drawable/logo"
+            android:contentDescription="@string/app_name"
 			/>
 		
 		<ScrollView
@@ -65,7 +66,8 @@
 					android:layout_marginBottom="10dp"
             		android:onClick="onRefreshClick"
 				    android:text="@string/auth_check_server"
-				    android:visibility="gone" />
+				    android:visibility="gone"
+                    android:contentDescription="@string/auth_check_server"/>
 				<TextView
 				    android:id="@+id/instructions_message"
 				    android:layout_width="wrap_content"
@@ -73,7 +75,8 @@
 				    android:layout_gravity="fill_horizontal"
 				    android:text="@string/auth_expired_basic_auth_toast" 
 				    android:visibility="gone"
-				    android:layout_marginBottom="10dp"/>
+				    android:layout_marginBottom="10dp"
+                    android:contentDescription="@string/auth_expired_basic_auth_toast"/>
 			    <FrameLayout 
 	        		android:id="@+id/hostUrlFrame"
 					android:layout_width="match_parent"
@@ -104,6 +107,7 @@
             			android:onClick="onRefreshClick"
 					    android:visibility="gone"
 						android:background="@android:color/transparent"
+                        android:contentDescription="@string/auth_refresh_button"
 					    />
 				</FrameLayout>
 		
@@ -115,7 +119,8 @@
 					android:drawableLeft="@android:drawable/stat_notify_sync"
 					android:drawablePadding="5dp"
 					android:gravity="center_vertical"
-					android:text="@string/auth_testing_connection" />
+					android:text="@string/auth_testing_connection"
+                    android:contentDescription="@string/auth_testing_connection"/>
 		             
 				<CheckBox
 					android:id="@+id/oauth_onOff_check"
@@ -125,6 +130,7 @@
 					android:onClick="onCheckClick"
 					android:text="@string/oauth_check_onoff"
 					android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:contentDescription="@string/oauth_check_onoff"
 					/>
 		
 				<EditText
@@ -136,7 +142,7 @@
 					android:text="@string/oauth2_url_endpoint_auth"
 					android:singleLine="true"
 					android:inputType="textUri"
-					android:visibility="gone" >
+					android:visibility="gone">
 				</EditText>            
 				
 				<EditText
@@ -148,7 +154,7 @@
 					android:text="@string/oauth2_url_endpoint_access"
 					android:singleLine="true"
 					android:inputType="textUri"
-					android:visibility="gone" >
+					android:visibility="gone">
 					<requestFocus />
 				</EditText>            
 		
@@ -158,7 +164,7 @@
 					android:layout_height="wrap_content"
 					android:ems="10"
 					android:hint="@string/auth_username"
-					android:inputType="textNoSuggestions" />
+					android:inputType="textNoSuggestions"/>
 		
 				<EditText
 				    android:id="@+id/account_password"
@@ -178,6 +184,7 @@
 					android:text="@string/auth_unauthorized"
 					android:drawableLeft="@android:drawable/stat_notify_sync"
 					android:drawablePadding="5dip"
+                    android:contentDescription="@string/auth_unauthorized"
 					/>
 
 			</LinearLayout>
@@ -200,7 +207,8 @@
 		    android:layout_gravity="center_horizontal"
 		    android:enabled="false"
 		    android:onClick="onOkClick"
-		    android:text="@string/setup_btn_connect" />
+		    android:text="@string/setup_btn_connect"
+            android:contentDescription="@string/setup_btn_connect"/>
 		
 		<Button
 		    android:id="@+id/welcome_link"
@@ -212,7 +220,8 @@
 		    android:paddingBottom="5dp"
 		    android:paddingTop="5dp"
 		    android:text="@string/auth_register"
-		    android:textColor="#0000FF"/>
+		    android:textColor="#0000FF"
+            android:contentDescription="@string/auth_register"/>
 	</LinearLayout>
 		
 </RelativeLayout>
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index e3321f94..2f9f98ec 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -41,7 +41,8 @@
             android:layout_marginBottom="10dp"
             android:layout_marginTop="10dp"
             android:background="@color/login_logo_background_color"
-            android:src="@drawable/logo" />
+            android:src="@drawable/logo"
+            android:contentDescription="@string/app_name"/>
 
         <Button
             android:id="@+id/centeredRefreshButton"
@@ -51,7 +52,8 @@
             android:layout_marginBottom="10dp"
             android:onClick="onRefreshClick"
             android:text="@string/auth_check_server"
-            android:visibility="gone" />
+            android:visibility="gone"
+            android:contentDescription="@string/auth_check_server"/>
         
         <TextView
             android:id="@+id/instructions_message"
@@ -60,7 +62,8 @@
             android:layout_gravity="fill_horizontal"
             android:text="@string/auth_expired_basic_auth_toast"
             android:visibility="gone"
-            android:layout_marginBottom="10dp" />
+            android:layout_marginBottom="10dp"
+            android:contentDescription="@string/auth_expired_basic_auth_toast"/>
 
 	    <FrameLayout 
 	        android:id="@+id/hostUrlFrame"
@@ -92,6 +95,7 @@
             	android:onClick="onRefreshClick"
 				android:visibility="gone"
 				android:background="@android:color/transparent"
+                android:contentDescription="@string/auth_refresh_button"
 			    />
 		</FrameLayout>
 
@@ -103,7 +107,8 @@
             android:drawableLeft="@android:drawable/stat_notify_sync"
             android:drawablePadding="5dp"
             android:gravity="center_vertical"
-            android:text="@string/auth_testing_connection" />
+            android:text="@string/auth_testing_connection"
+            android:contentDescription="@string/auth_testing_connection"/>
 
         <CheckBox
             android:id="@+id/oauth_onOff_check"
@@ -113,6 +118,7 @@
             android:onClick="onCheckClick"
             android:text="@string/oauth_check_onoff"
             android:textAppearance="?android:attr/textAppearanceSmall"
+            android:contentDescription="@string/oauth_check_onoff"
             />
 
         <EditText
@@ -124,7 +130,7 @@
             android:text="@string/oauth2_url_endpoint_auth"
             android:singleLine="true"
             android:inputType="textUri"
-            android:visibility="gone" >
+            android:visibility="gone">
         </EditText>
 
         <EditText
@@ -136,7 +142,7 @@
             android:text="@string/oauth2_url_endpoint_access"
             android:singleLine="true"
             android:inputType="textUri"
-            android:visibility="gone" />
+            android:visibility="gone"/>
 
         <EditText
             android:id="@+id/account_username"
@@ -144,7 +150,7 @@
             android:layout_height="wrap_content"
             android:ems="10"
             android:hint="@string/auth_username"
-            android:inputType="textNoSuggestions" 
+            android:inputType="textNoSuggestions"
 			/>
 
 		<EditText
@@ -154,7 +160,7 @@
 		    android:drawablePadding="5dp"
 		    android:ems="10"
 		    android:hint="@string/auth_password"
-		    android:inputType="textPassword" 
+		    android:inputType="textPassword"
             />
         
         <TextView
@@ -165,7 +171,8 @@
             android:drawableLeft="@android:drawable/stat_notify_sync"
             android:drawablePadding="5dp"
             android:gravity="center_vertical"
-            android:text="@string/auth_unauthorized" />
+            android:text="@string/auth_unauthorized"
+            android:contentDescription="@string/auth_unauthorized"/>
 
         <Button
             android:id="@+id/buttonOK"
@@ -174,7 +181,8 @@
             android:layout_gravity="center_horizontal"
             android:enabled="false"
             android:onClick="onOkClick"
-            android:text="@string/setup_btn_connect" />
+            android:text="@string/setup_btn_connect"
+            android:contentDescription="@string/setup_btn_connect"/>
 
         <Button
             android:id="@+id/welcome_link"
@@ -185,7 +193,8 @@
             android:paddingBottom="5dp"
             android:paddingTop="5dp"
             android:text="@string/auth_register"
-            android:textColor="#0000FF"/>
+            android:textColor="#0000FF"
+            android:contentDescription="@string/auth_register"/>
 
     </LinearLayout>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2ea02dba..310edd5a 100644
--- 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>
-- 
2.11.0