From 12f0db95f8d33a09895dfa6200cfa65bd3903733 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Tue, 21 Oct 2014 11:08:15 +0200
Subject: [PATCH] Replaced account setup assistant header image by text in
 wizard

---
 res/layout-small/setup_generic_login.xml         | 9 ++++++---
 res/layout-small/setup_linphone_login.xml        | 7 +++++--
 res/layout-small/setup_menu.xml                  | 8 ++++++--
 res/layout-small/setup_wizard.xml                | 7 +++++--
 res/layout-small/setup_wizard_confirm.xml        | 8 ++++++--
 res/layout-sw533dp-land/setup_generic_login.xml  | 9 ++++++---
 res/layout-sw533dp-land/setup_linphone_login.xml | 7 +++++--
 res/layout-sw533dp-land/setup_menu.xml           | 8 ++++++--
 res/layout-sw533dp-land/setup_wizard.xml         | 7 +++++--
 res/layout/setup_generic_login.xml               | 9 ++++++---
 res/layout/setup_linphone_login.xml              | 7 +++++--
 res/layout/setup_menu.xml                        | 8 ++++++--
 res/layout/setup_remote_provisioning.xml         | 7 +++++--
 res/layout/setup_remote_provisioning_login.xml   | 7 +++++--
 res/layout/setup_wizard.xml                      | 7 +++++--
 res/values-FR/strings.xml                        | 1 +
 res/values-RU/strings.xml                        | 1 +
 res/values/strings.xml                           | 3 ++-
 18 files changed, 86 insertions(+), 34 deletions(-)

diff --git a/res/layout-small/setup_generic_login.xml b/res/layout-small/setup_generic_login.xml
index 0af4722f8..68c52a87b 100644
--- a/res/layout-small/setup_generic_login.xml
+++ b/res/layout-small/setup_generic_login.xml
@@ -4,13 +4,16 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
     
-    <ImageView 
-	    android:contentDescription="@string/content_description_welcome"
+    <TextView 
+   		android:contentDescription="@string/content_description_welcome"
 	    android:paddingTop="40dp"
+	    android:textSize="20sp"
+	    android:textStyle="bold"
+	    android:textColor="@android:color/black"
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
 	    android:visibility="gone"
-	    android:src="@drawable/setup_title_assistant"/>
+	    android:text="@string/setup_title_assistant"/>
     
     <TextView 
 	    android:paddingTop="10dp"
diff --git a/res/layout-small/setup_linphone_login.xml b/res/layout-small/setup_linphone_login.xml
index 43fb7145f..7d2da6b49 100644
--- a/res/layout-small/setup_linphone_login.xml
+++ b/res/layout-small/setup_linphone_login.xml
@@ -4,13 +4,16 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
     
-    <ImageView 
+    <TextView 
    		android:contentDescription="@string/content_description_welcome"
 	    android:paddingTop="40dp"
+	    android:textSize="20sp"
+	    android:textStyle="bold"
+	    android:textColor="@android:color/black"
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
 	    android:visibility="gone"
-	    android:src="@drawable/setup_title_assistant"/>
+	    android:text="@string/setup_title_assistant"/>
     
     <TextView 
 	    android:paddingTop="10dp"
diff --git a/res/layout-small/setup_menu.xml b/res/layout-small/setup_menu.xml
index e7b0517f6..f38478bc7 100644
--- a/res/layout-small/setup_menu.xml
+++ b/res/layout-small/setup_menu.xml
@@ -4,11 +4,15 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
     
-    <ImageView 
+    <TextView 
+   		android:contentDescription="@string/content_description_welcome"
 	    android:paddingTop="10dp"
+	    android:textSize="20sp"
+	    android:textStyle="bold"
+	    android:textColor="@android:color/black"
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
-	    android:src="@drawable/setup_title_assistant"/>
+	    android:text="@string/setup_title_assistant"/>
     
     <LinearLayout 
 	    android:layout_width="match_parent"
diff --git a/res/layout-small/setup_wizard.xml b/res/layout-small/setup_wizard.xml
index d04f65fe8..dd7d80908 100644
--- a/res/layout-small/setup_wizard.xml
+++ b/res/layout-small/setup_wizard.xml
@@ -4,13 +4,16 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
     
-    <ImageView 
+    <TextView 
    		android:contentDescription="@string/content_description_welcome"
 	    android:paddingTop="40dp"
+	    android:textSize="20sp"
+	    android:textStyle="bold"
+	    android:textColor="@android:color/black"
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
 	    android:visibility="gone"
-	    android:src="@drawable/setup_title_assistant"/>
+	    android:text="@string/setup_title_assistant"/>
     
    	<TextView 
 	    android:paddingTop="10dp"
diff --git a/res/layout-small/setup_wizard_confirm.xml b/res/layout-small/setup_wizard_confirm.xml
index cd76d7a35..bdd1c7bfe 100644
--- a/res/layout-small/setup_wizard_confirm.xml
+++ b/res/layout-small/setup_wizard_confirm.xml
@@ -5,12 +5,16 @@
     android:gravity="center_horizontal"
     android:orientation="vertical" >
     
-    <ImageView 
+    <TextView 
+   		android:contentDescription="@string/content_description_welcome"
 	    android:paddingTop="40dp"
+	    android:textSize="20sp"
+	    android:textStyle="bold"
+	    android:textColor="@android:color/black"
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
 	    android:visibility="gone"
-	    android:src="@drawable/setup_title_assistant"/>
+	    android:text="@string/setup_title_assistant"/>
     
     <TextView 
 	    android:paddingTop="40dp"
diff --git a/res/layout-sw533dp-land/setup_generic_login.xml b/res/layout-sw533dp-land/setup_generic_login.xml
index 4d4aafa67..ca7c84af5 100644
--- a/res/layout-sw533dp-land/setup_generic_login.xml
+++ b/res/layout-sw533dp-land/setup_generic_login.xml
@@ -4,12 +4,15 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
     
-    <ImageView 
-	    android:contentDescription="@string/content_description_welcome"
+    <TextView 
+   		android:contentDescription="@string/content_description_welcome"
 	    android:paddingTop="40dp"
+	    android:textSize="20sp"
+	    android:textStyle="bold"
+	    android:textColor="@android:color/black"
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
-	    android:src="@drawable/setup_title_assistant"/>
+	    android:text="@string/setup_title_assistant"/>
     
     <TextView 
 	    android:paddingTop="10dp"
diff --git a/res/layout-sw533dp-land/setup_linphone_login.xml b/res/layout-sw533dp-land/setup_linphone_login.xml
index 53effc74f..430786096 100644
--- a/res/layout-sw533dp-land/setup_linphone_login.xml
+++ b/res/layout-sw533dp-land/setup_linphone_login.xml
@@ -4,12 +4,15 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
     
-    <ImageView 
+    <TextView 
    		android:contentDescription="@string/content_description_welcome"
 	    android:paddingTop="40dp"
+	    android:textSize="20sp"
+	    android:textStyle="bold"
+	    android:textColor="@android:color/black"
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
-	    android:src="@drawable/setup_title_assistant"/>
+	    android:text="@string/setup_title_assistant"/>
     
     <TextView 
 	    android:paddingTop="10dp"
diff --git a/res/layout-sw533dp-land/setup_menu.xml b/res/layout-sw533dp-land/setup_menu.xml
index bd465eff1..e80f6cbe0 100644
--- a/res/layout-sw533dp-land/setup_menu.xml
+++ b/res/layout-sw533dp-land/setup_menu.xml
@@ -4,11 +4,15 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
     
-    <ImageView 
+    <TextView 
+   		android:contentDescription="@string/content_description_welcome"
 	    android:paddingTop="40dp"
+	    android:textSize="20sp"
+	    android:textStyle="bold"
+	    android:textColor="@android:color/black"
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
-	    android:src="@drawable/setup_title_assistant"/>
+	    android:text="@string/setup_title_assistant"/>
     
     <LinearLayout 
 	    android:layout_width="match_parent"
diff --git a/res/layout-sw533dp-land/setup_wizard.xml b/res/layout-sw533dp-land/setup_wizard.xml
index c24f77ff0..7f838ce1f 100644
--- a/res/layout-sw533dp-land/setup_wizard.xml
+++ b/res/layout-sw533dp-land/setup_wizard.xml
@@ -4,12 +4,15 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
     
-    <ImageView 
+    <TextView 
    		android:contentDescription="@string/content_description_welcome"
 	    android:paddingTop="40dp"
+	    android:textSize="20sp"
+	    android:textStyle="bold"
+	    android:textColor="@android:color/black"
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
-	    android:src="@drawable/setup_title_assistant"/>
+	    android:text="@string/setup_title_assistant"/>
     
    	<TextView 
 	    android:paddingTop="10dp"
diff --git a/res/layout/setup_generic_login.xml b/res/layout/setup_generic_login.xml
index 44d4b7a09..6b696d18d 100644
--- a/res/layout/setup_generic_login.xml
+++ b/res/layout/setup_generic_login.xml
@@ -4,12 +4,15 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
     
-    <ImageView 
-	    android:contentDescription="@string/content_description_welcome"
+    <TextView 
+   		android:contentDescription="@string/content_description_welcome"
 	    android:paddingTop="40dp"
+	    android:textSize="20sp"
+	    android:textStyle="bold"
+	    android:textColor="@android:color/black"
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
-	    android:src="@drawable/setup_title_assistant"/>
+	    android:text="@string/setup_title_assistant"/>
     
     <TextView 
 	    android:paddingTop="10dp"
diff --git a/res/layout/setup_linphone_login.xml b/res/layout/setup_linphone_login.xml
index f4a64d588..5841dd34f 100644
--- a/res/layout/setup_linphone_login.xml
+++ b/res/layout/setup_linphone_login.xml
@@ -4,12 +4,15 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
     
-    <ImageView 
+    <TextView 
    		android:contentDescription="@string/content_description_welcome"
 	    android:paddingTop="40dp"
+	    android:textSize="20sp"
+	    android:textStyle="bold"
+	    android:textColor="@android:color/black"
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
-	    android:src="@drawable/setup_title_assistant"/>
+	    android:text="@string/setup_title_assistant"/>
     
     <TextView 
 	    android:paddingTop="10dp"
diff --git a/res/layout/setup_menu.xml b/res/layout/setup_menu.xml
index 54b608de0..581e3b0a6 100644
--- a/res/layout/setup_menu.xml
+++ b/res/layout/setup_menu.xml
@@ -4,11 +4,15 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
     
-    <ImageView 
+    <TextView 
+   		android:contentDescription="@string/content_description_welcome"
 	    android:paddingTop="40dp"
+	    android:textSize="20sp"
+	    android:textStyle="bold"
+	    android:textColor="@android:color/black"
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
-	    android:src="@drawable/setup_title_assistant"/>
+	    android:text="@string/setup_title_assistant"/>
     
     <LinearLayout 
 	    android:layout_width="match_parent"
diff --git a/res/layout/setup_remote_provisioning.xml b/res/layout/setup_remote_provisioning.xml
index e0f5dc0ff..bf9feff07 100644
--- a/res/layout/setup_remote_provisioning.xml
+++ b/res/layout/setup_remote_provisioning.xml
@@ -4,12 +4,15 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
     
-    <ImageView 
+    <TextView 
    		android:contentDescription="@string/content_description_welcome"
 	    android:paddingTop="40dp"
+	    android:textSize="20sp"
+	    android:textStyle="bold"
+	    android:textColor="@android:color/black"
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
-	    android:src="@drawable/setup_title_assistant"/>
+	    android:text="@string/setup_title_assistant"/>
     
     <TextView 
 	    android:paddingTop="10dp"
diff --git a/res/layout/setup_remote_provisioning_login.xml b/res/layout/setup_remote_provisioning_login.xml
index f2e206989..f3022b9fb 100644
--- a/res/layout/setup_remote_provisioning_login.xml
+++ b/res/layout/setup_remote_provisioning_login.xml
@@ -41,12 +41,15 @@
 		android:layout_above="@id/mark"
 	    android:orientation="vertical">
 	    
-	    <ImageView 
+	    <TextView 
 	   		android:contentDescription="@string/content_description_welcome"
 		    android:paddingTop="40dp"
+		    android:textSize="20sp"
+		    android:textStyle="bold"
+		    android:textColor="@android:color/black"
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"
-		    android:src="@drawable/setup_title_assistant"/>
+		    android:text="@string/setup_title_assistant"/>
 	    
 	    <TextView 
 		    android:paddingTop="10dp"
diff --git a/res/layout/setup_wizard.xml b/res/layout/setup_wizard.xml
index 1d3274c50..ac1804a66 100644
--- a/res/layout/setup_wizard.xml
+++ b/res/layout/setup_wizard.xml
@@ -4,12 +4,15 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
     
-    <ImageView 
+    <TextView 
    		android:contentDescription="@string/content_description_welcome"
 	    android:paddingTop="40dp"
+	    android:textSize="20sp"
+	    android:textStyle="bold"
+	    android:textColor="@android:color/black"
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
-	    android:src="@drawable/setup_title_assistant"/>
+	    android:text="@string/setup_title_assistant"/>
     
    	<TextView 
 	    android:paddingTop="10dp"
diff --git a/res/values-FR/strings.xml b/res/values-FR/strings.xml
index 6913a23f2..ff7b006c1 100644
--- a/res/values-FR/strings.xml
+++ b/res/values-FR/strings.xml
@@ -392,6 +392,7 @@
 	<string name="setup_remote_provisioning_hint">Cet assistant va télécharger une configuration existante.</string>
 	<string name="setup_remote_provisioning_url_hint">addresse où télécharger la configuration</string>
 	<string name="setup_confirm_username">Votre nom d\'utilisateur sera %s (les majuscules sont interdites). Acceptez-vous ?</string>
+	<string name="setup_title_assistant">Assistant de création de compte</string>
 	
 	<string name="zrtp_accept">Accepter</string>
 	<string name="zrtp_deny">Refuser</string>
diff --git a/res/values-RU/strings.xml b/res/values-RU/strings.xml
index 543d40091..fdd4ef014 100755
--- a/res/values-RU/strings.xml
+++ b/res/values-RU/strings.xml
@@ -443,6 +443,7 @@
 	<string name="setup_remote_provisioning_hint">This assistant will download an existing configuration.</string>
 	<string name="setup_remote_provisioning_url_hint">provisioning url</string>
 	<string name="setup_confirm_username">Your username will be %s (uppercase characters are not allowed). Do you accept ?</string>
+	<string name="setup_title_assistant">Account setup assistant</string>
 	
 	<string name="zrtp_accept">Accept</string>
 	<string name="zrtp_deny">Deny</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7c4130dfa..69679069b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -471,7 +471,8 @@
 	<string name="setup_remote_provisioning_url_hint">provisioning url</string>
 	<string name="setup_remote_provisioning_login_hint">The configuration you downloaded doesn\'t include your account. Please fill it in.</string>
 	<string name="setup_confirm_username">Your username will be %s (uppercase characters are not allowed). Do you accept ?</string>
-
+	<string name="setup_title_assistant">Account setup assistant</string>
+	
 	<string name="zrtp_accept">Accept</string>
 	<string name="zrtp_deny">Deny</string>
 	<string name="zrtp_help">You should only accept if you have the same code (see above) as your correspondent</string>