From d99796b94456070ae47dd3c442d2067766ec521c Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Tue, 11 Sep 2012 16:19:41 +0200
Subject: [PATCH] Remove warnings from layouts

---
 res/layout/incall.xml               | 1 +
 res/layout/main.xml                 | 5 +++++
 res/layout/setup.xml                | 2 ++
 res/layout/setup_generic_login.xml  | 2 ++
 res/layout/setup_linphone_login.xml | 2 ++
 res/layout/setup_wizard.xml         | 5 +++++
 res/values/strings.xml              | 2 ++
 7 files changed, 19 insertions(+)

diff --git a/res/layout/incall.xml b/res/layout/incall.xml
index 255ed2ad9..5e5e9bdb1 100644
--- a/res/layout/incall.xml
+++ b/res/layout/incall.xml
@@ -112,6 +112,7 @@
                 android:visibility="invisible" />
 
             <ImageView
+		    	android:contentDescription="@string/content_description_add_call"
                 android:id="@+id/addCall"
                 android:layout_width="match_parent"
                 android:layout_height="75dp"
diff --git a/res/layout/main.xml b/res/layout/main.xml
index a188e06ce..797b3b839 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -14,6 +14,7 @@
         android:orientation="horizontal">
     
 		<ImageView
+		    android:contentDescription="@string/content_description_mark"
 		    android:layout_width="match_parent"
 		    android:layout_height="wrap_content"
 		    android:layout_weight="0.2"
@@ -23,6 +24,7 @@
 		    android:visibility="invisible" />
 		
 		<ImageView
+		    android:contentDescription="@string/content_description_mark"
 		    android:layout_width="match_parent"
 		    android:layout_height="wrap_content"
 		    android:layout_weight="0.2"
@@ -32,6 +34,7 @@
 		    android:visibility="invisible" />
 		
 		<ImageView
+		    android:contentDescription="@string/content_description_mark"
 		    android:layout_width="match_parent"
 		    android:layout_height="wrap_content"
 		    android:layout_weight="0.2"
@@ -41,6 +44,7 @@
 		    android:visibility="invisible" />
 		
 		<ImageView
+		    android:contentDescription="@string/content_description_mark"
 		    android:layout_width="match_parent"
 		    android:layout_height="wrap_content"
 		    android:layout_weight="0.2"
@@ -50,6 +54,7 @@
 		    android:visibility="invisible" />
 		
 		<ImageView
+		    android:contentDescription="@string/content_description_mark"
 		    android:layout_width="match_parent"
 		    android:layout_height="wrap_content"
 		    android:layout_weight="0.2"
diff --git a/res/layout/setup.xml b/res/layout/setup.xml
index bd648a0fc..69b8845c9 100644
--- a/res/layout/setup.xml
+++ b/res/layout/setup.xml
@@ -12,6 +12,7 @@
 		android:orientation="horizontal">
 	    
 		<ImageView 
+		    android:contentDescription="@string/content_description_mark"
 			android:visibility="invisible"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -21,6 +22,7 @@
 			android:layout_weight="0.5"/>
 		          
 		<ImageView 
+		    android:contentDescription="@string/content_description_mark"
 			android:visibility="invisible"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/res/layout/setup_generic_login.xml b/res/layout/setup_generic_login.xml
index f98a78225..551b433a2 100644
--- a/res/layout/setup_generic_login.xml
+++ b/res/layout/setup_generic_login.xml
@@ -5,6 +5,7 @@
     android:orientation="vertical" >
     
     <ImageView 
+	    android:contentDescription="@string/content_description_welcome"
 	    android:paddingTop="40dp"
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
@@ -71,6 +72,7 @@
 		    android:layout_height="wrap_content">
             
 	        <ImageView
+	    		android:contentDescription="@string/content_description_validate"
 	            android:id="@+id/setup_apply"
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
diff --git a/res/layout/setup_linphone_login.xml b/res/layout/setup_linphone_login.xml
index 25ec856cd..20697777f 100644
--- a/res/layout/setup_linphone_login.xml
+++ b/res/layout/setup_linphone_login.xml
@@ -5,6 +5,7 @@
     android:orientation="vertical">
     
     <ImageView 
+   		android:contentDescription="@string/content_description_welcome"
 	    android:paddingTop="40dp"
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
@@ -58,6 +59,7 @@
 		    android:layout_height="wrap_content">
             
 	        <ImageView
+	    		android:contentDescription="@string/content_description_validate"
 	            android:id="@+id/setup_apply"
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
diff --git a/res/layout/setup_wizard.xml b/res/layout/setup_wizard.xml
index 619c09ac8..2b71e5803 100644
--- a/res/layout/setup_wizard.xml
+++ b/res/layout/setup_wizard.xml
@@ -5,6 +5,7 @@
     android:orientation="vertical" >
     
     <ImageView 
+   		android:contentDescription="@string/content_description_welcome"
 	    android:paddingTop="40dp"
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
@@ -44,6 +45,7 @@
             	android:background="@drawable/setup_field_background" />
 	        
 	        <ImageView 
+	    		android:contentDescription="@string/content_description_setup_ok"
 	            android:id="@+id/setup_username_ok"
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
@@ -85,6 +87,7 @@
             	android:background="@drawable/setup_field_background" />
 	        
 	        <ImageView 
+	    		android:contentDescription="@string/content_description_setup_ok"
 	            android:id="@+id/setup_password_ok"
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
@@ -113,6 +116,7 @@
             	android:background="@drawable/setup_field_background" />
 	        
 	        <ImageView 
+	    		android:contentDescription="@string/content_description_setup_ok"
 	            android:id="@+id/setup_email_ok"
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
@@ -129,6 +133,7 @@
 		    android:layout_height="wrap_content">
             
 	        <ImageView
+	    		android:contentDescription="@string/content_description_validate"
 	            android:id="@+id/setup_create"
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c3eea92f3..225065098 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -300,6 +300,8 @@
 	<string name="content_description_cancel"></string>
 	<string name="content_description_next"></string>
 	<string name="content_description_back"></string>
+	<string name="content_description_setup_ok"></string>
+	<string name="content_description_mark"></string>
 	
 	<string name="setup_title">Account Setup Assistant</string>
 	<string name="setup_welcome">This assistant will help you to use a SIP account for your calls.</string>