From f4e4c9c9af8fdda10291e93680b0a3290c2339e4 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Tue, 11 Sep 2012 17:10:10 +0200
Subject: [PATCH] Small fixes

---
 res/layout-xlarge-land/main.xml        |  6 ++++++
 res/values/strings.xml                 |  8 ++++----
 src/org/linphone/LinphoneActivity.java | 19 -------------------
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/res/layout-xlarge-land/main.xml b/res/layout-xlarge-land/main.xml
index b3586abb6..322af7b4e 100644
--- a/res/layout-xlarge-land/main.xml
+++ b/res/layout-xlarge-land/main.xml
@@ -13,6 +13,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"
@@ -22,6 +23,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"
@@ -31,6 +33,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.25"
@@ -40,6 +43,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"
@@ -49,6 +53,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"
@@ -66,6 +71,7 @@
         android:layout_alignParentTop="true" >
 
         <LinearLayout
+            android:baselineAligned="false"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="horizontal"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 225065098..1b3454476 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -25,7 +25,7 @@
     <string name="verify_sas_fmt">Verify %s</string>
     <string name="communication_encrypted">Encrypted</string>
    
-	<string name="waiting_for_startup">Starting up...</string>
+	<string name="waiting_for_startup">Starting up&#8230;</string>
 	<string name="couldnt_accept_call">An error occurred while accepting call</string>
 
 	<string name="error_adding_new_call">Error adding new call</string>
@@ -172,8 +172,8 @@
 	<string name="about_bugreport_email_text">Describe problem here</string>
 	<string name="about_error_generating_bugreport_attachement">Error generating bug report</string>
 	<string name="about_logs_not_found">Logs not found.</string>
-	<string name="about_reading_logs">Reading logs, may takes time...</string>
-	<string name="about_mailer_chooser_text">Send bug report with...</string>
+	<string name="about_reading_logs">Reading logs, may takes time&#8230;</string>
+	<string name="about_mailer_chooser_text">Send bug report with&#8230;</string>
 	<string name="menu_about">About</string>
 	<string name="pref_audio">Audio</string>
 	<string name="menu_exit">Exit</string>
@@ -216,7 +216,7 @@
 	<string name="pref_stun_server">Stun server</string>
 	<string name="pref_ice_enable">Enable ICE</string>
 	<string name="pref_ice_enable_summary">A STUN server must be configured to use ICE</string>
-	<string name="ec_calibrating">Calibrating...</string>
+	<string name="ec_calibrating">Calibrating&#8230;</string>
 	<string name="ec_calibrated">Calibrated [%s ms]</string>
 	<string name="failed">failed</string>
 	<string name="first_login_explanation">Enter your username and password to connect to the service.</string>
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 503a08f7f..eb952a462 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -49,7 +49,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.Cursor;
-import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -160,27 +159,18 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
 	}
 	
 	private void initButtons() {
-//		Typeface typeface = Typeface.createFromAsset(getAssets(), "font_linphone.ttf");
-		Typeface typeface = null;
-		
 		history = (RelativeLayout) findViewById(R.id.history);
         history.setOnClickListener(this);
-        setMenuTypeface(history, typeface);
         contacts  = (RelativeLayout) findViewById(R.id.contacts);
         contacts.setOnClickListener(this);
-        setMenuTypeface(contacts, typeface);
         dialer = (ImageView) findViewById(R.id.dialer);
         dialer.setOnClickListener(this);
         settings = (RelativeLayout) findViewById(R.id.settings);
         settings.setOnClickListener(this);
-        setMenuTypeface(settings, typeface);
         chat = (RelativeLayout) findViewById(R.id.chat);
 		chat.setOnClickListener(this);
-        setMenuTypeface(chat, typeface);
 		aboutChat = (RelativeLayout) findViewById(R.id.about_chat);
-        setMenuTypeface(aboutChat, typeface);
 		aboutSettings = (RelativeLayout) findViewById(R.id.about_settings);
-        setMenuTypeface(aboutSettings, typeface);
 		
 		if (getResources().getBoolean(R.bool.replace_chat_by_about)) {
 			chat.setVisibility(View.GONE);
@@ -913,15 +903,6 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
 		stopService(new Intent(ACTION_MAIN).setClass(this, LinphoneService.class));
 	}
 	
-	private void setMenuTypeface(RelativeLayout menu, Typeface typeface) {
-		if (typeface == null) {
-			return;
-		}
-		
-		TextView tv = (TextView) menu.findViewById(R.id.text);
-		tv.setTypeface(typeface);
-	}
-	
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		super.onActivityResult(resultCode, requestCode, data);