From ccb588d880fff9e7744013fa286cd1c4212b820b Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Thu, 29 Jul 2010 09:36:19 +0200
Subject: [PATCH] fix hidden dgits on some Moto phones

---
 AndroidManifest.xml                    |  2 +-
 res/layout/dialer.xml                  | 26 +++++++++++++-------------
 src/org/linphone/DialerActivity.java   |  5 ++++-
 src/org/linphone/LinphoneActivity.java |  2 +-
 submodules/linphone                    |  2 +-
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 51eaab8e8..117f88824 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.linphone"
-      android:versionCode="1014" android:versionName="1.0.14"> 
+      android:versionCode="1015" android:versionName="1.0.15"> 
     <uses-sdk android:minSdkVersion="3" />
     <application android:label="@string/app_name" android:debuggable = "true" android:icon="@drawable/logo_linphone_57x57">
          
diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
index da3e8676b..314fb06fd 100644
--- a/res/layout/dialer.xml
+++ b/res/layout/dialer.xml
@@ -11,7 +11,7 @@
 				android:lines="1" android:layout_weight="0.2" android:layout_height="fill_parent" android:padding="10px"></EditText>
 			<Button android:layout_height="fill_parent" android:background="@drawable/clavier_bg" android:id="@+id/Erase"
 				android:layout_width="fill_parent" android:layout_weight="0.8" android:textSize="20sp"
-				android:textStyle="bold" android:text="&lt;" android:layout_gravity="top"></Button>
+				android:textStyle="bold" android:text="&lt;" android:layout_gravity="top" android:textColor="@android:color/black"></Button>
 		</LinearLayout>
 
 
@@ -33,15 +33,15 @@
 			<Button android:id="@+id/Button01" android:text="1"
 				android:layout_width="fill_parent" android:layout_height="fill_parent"
 				android:textStyle="bold" android:textSize="20sp"
-				android:layout_weight="1" android:background="@drawable/clavier_bg"></Button>
+				android:layout_weight="1" android:background="@drawable/clavier_bg" android:textColor="@android:color/black"></Button>
 			<Button android:id="@+id/Button02" android:text="2"
 				android:layout_width="fill_parent" android:layout_height="fill_parent"
 				android:textStyle="bold" android:textSize="20sp"
-				android:layout_weight="1" android:background="@drawable/clavier_bg"></Button>
+				android:layout_weight="1" android:background="@drawable/clavier_bg" android:textColor="@android:color/black"></Button>
 			<Button android:id="@+id/Button03" android:text="3"
 				android:layout_width="fill_parent" android:layout_height="fill_parent"
 				android:textStyle="bold" android:textSize="20sp"
-				android:layout_weight="1" android:background="@drawable/clavier_bg"></Button>
+				android:layout_weight="1" android:background="@drawable/clavier_bg" android:textColor="@android:color/black"></Button>
 		</TableRow>
 		<TableRow android:layout_height="fill_parent"
 			android:layout_weight="1" android:id="@+id/DialerRow02"
@@ -49,45 +49,45 @@
 			<Button android:id="@+id/Button04" android:text="4"
 				android:layout_width="fill_parent" android:layout_height="fill_parent"
 				android:textStyle="bold" android:textSize="20sp"
-				android:layout_weight="1" android:background="@drawable/clavier_bg"></Button>
+				android:layout_weight="1" android:background="@drawable/clavier_bg" android:textColor="@android:color/black"></Button>
 			<Button android:text="5" android:id="@+id/Button05"
 				android:layout_width="fill_parent" android:layout_height="fill_parent"
 				android:textStyle="bold" android:textSize="20sp"
-				android:layout_weight="1" android:background="@drawable/clavier_bg"></Button>
+				android:layout_weight="1" android:background="@drawable/clavier_bg" android:textColor="@android:color/black"></Button>
 			<Button android:id="@+id/Button06" android:text="6"
 				android:layout_width="fill_parent" android:layout_height="fill_parent"
 				android:textStyle="bold" android:textSize="20sp"
-				android:layout_weight="1" android:background="@drawable/clavier_bg"></Button>
+				android:layout_weight="1" android:background="@drawable/clavier_bg" android:textColor="@android:color/black"></Button>
 		</TableRow>
 		<TableRow android:layout_weight="1" android:layout_height="fill_parent"
 			android:id="@+id/DialerRow03" android:layout_width="fill_parent">
 			<Button android:text="7" android:id="@+id/Button07"
 				android:layout_width="fill_parent" android:layout_height="fill_parent"
 				android:textStyle="bold" android:textSize="20sp"
-				android:layout_weight="1" android:background="@drawable/clavier_bg"></Button>
+				android:layout_weight="1" android:background="@drawable/clavier_bg" android:textColor="@android:color/black"></Button>
 			<Button android:id="@+id/Button08" android:text="8"
 				android:layout_width="fill_parent" android:layout_height="fill_parent"
 				android:textStyle="bold" android:textSize="20sp"
-				android:layout_weight="1" android:background="@drawable/clavier_bg"></Button>
+				android:layout_weight="1" android:background="@drawable/clavier_bg" android:textColor="@android:color/black"></Button>
 			<Button android:text="9" android:id="@+id/Button09"
 				android:layout_width="fill_parent" android:layout_height="fill_parent"
 				android:textStyle="bold" android:textSize="20sp"
-				android:layout_weight="1" android:background="@drawable/clavier_bg"></Button>
+				android:layout_weight="1" android:background="@drawable/clavier_bg" android:textColor="@android:color/black"></Button>
 		</TableRow>
 		<TableRow android:layout_weight="1" android:layout_height="fill_parent"
 			android:id="@+id/DialerRow04" android:layout_width="fill_parent">
 			<Button android:layout_width="fill_parent"
 				android:layout_height="fill_parent" android:text="*" android:id="@+id/ButtonStar"
 				android:textStyle="bold" android:textSize="20sp"
-				android:layout_weight="1" android:background="@drawable/clavier_bg"></Button>
+				android:layout_weight="1" android:background="@drawable/clavier_bg" android:textColor="@android:color/black"></Button>
 			<Button android:layout_width="fill_parent"
 				android:layout_height="fill_parent" android:text="0+" android:id="@+id/Button00"
 				android:textStyle="bold" android:textSize="20sp"
-				android:layout_weight="1" android:background="@drawable/clavier_bg"></Button>
+				android:layout_weight="1" android:background="@drawable/clavier_bg" android:textColor="@android:color/black"></Button>
 			<Button android:layout_width="fill_parent"
 				android:layout_height="fill_parent" android:id="@+id/ButtonHash"
 				android:text="#" android:textStyle="bold" android:textSize="20sp"
-				android:layout_weight="1" android:background="@drawable/clavier_bg"></Button>
+				android:layout_weight="1" android:background="@drawable/clavier_bg" android:textColor="@android:color/black"></Button>
 		</TableRow>
 
 
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index 89374a77c..270d012d9 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -124,6 +124,7 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
 			
 			mErase.setOnClickListener(new OnClickListener() {
 				public void onClick(View v) {
+					mDisplayName=null;
 					if (mAddress.length() >0) {
 						int lBegin = mAddress.getSelectionStart();
 						if (lBegin == -1) {
@@ -159,7 +160,9 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
 						}
 						return;
 					}
-					newOutgoingCall(mAddress.getText().toString(),mDisplayName);
+					if (mAddress.getText().length() >0) {
+						newOutgoingCall(mAddress.getText().toString(),mDisplayName);
+					}
 				}
 				
 			}); 
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 9571226e6..925575774 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -72,7 +72,7 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 		setContentView(R.layout.main);
 		
 		theLinphoneActivity = this;
-		// start linphone as background      
+		// start linphone as background       
 		Intent intent = new Intent(Intent.ACTION_MAIN);
 		intent.setClass(this, LinphoneService.class);
 		startService(intent);
diff --git a/submodules/linphone b/submodules/linphone
index 2b7bd0b0e..82291db35 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 2b7bd0b0e4c01ae08cb8064d2c70528b9770a807
+Subproject commit 82291db35ec30473717f9566025e0f3ff512a1d8