From 6fe3390dcebe163a11ced364181bde113d1f6df0 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Thu, 13 Oct 2011 15:01:11 +0200 Subject: [PATCH] Fix: Erase button of Uri picker now works. --- src/org/linphone/DialerActivity.java | 2 +- src/org/linphone/UriPickerActivity.java | 2 +- src/org/linphone/ui/EraseButton.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java index bbeaff1e4..e15b16a2b 100644 --- a/src/org/linphone/DialerActivity.java +++ b/src/org/linphone/DialerActivity.java @@ -120,7 +120,7 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin mAddress = (AddressText) findViewById(R.id.SipUri); mDisplayNameView = (TextView) findViewById(R.id.DisplayNameView); - ((EraseButton) findViewById(R.id.Erase)).setAddressView(mAddress); + ((EraseButton) findViewById(R.id.Erase)).setAddressWidget(mAddress); mCall = (CallButton) findViewById(R.id.Call); diff --git a/src/org/linphone/UriPickerActivity.java b/src/org/linphone/UriPickerActivity.java index 37a91a03a..105face5f 100644 --- a/src/org/linphone/UriPickerActivity.java +++ b/src/org/linphone/UriPickerActivity.java @@ -22,7 +22,6 @@ package org.linphone; import org.linphone.mediastream.Version; import org.linphone.ui.AddressAware; import org.linphone.ui.AddressText; -import org.linphone.ui.Numpad; import android.app.Activity; import android.app.TabActivity; @@ -133,6 +132,7 @@ public class UriPickerActivity extends TabActivity implements ContactPicked { // findViewById(R.id.AddCallCancelButton).setOnClickListener(this); ((AddressAware)findViewById(R.id.Dialer)).setAddressWidget(mAddress); + ((AddressAware)findViewById(R.id.Erase)).setAddressWidget(mAddress); super.onCreate(savedInstanceState); } diff --git a/src/org/linphone/ui/EraseButton.java b/src/org/linphone/ui/EraseButton.java index 8e253e765..289b8fa50 100644 --- a/src/org/linphone/ui/EraseButton.java +++ b/src/org/linphone/ui/EraseButton.java @@ -25,7 +25,7 @@ import android.view.View.OnClickListener; import android.view.View.OnLongClickListener; import android.widget.Button; -public class EraseButton extends Button implements OnClickListener, OnLongClickListener{ +public class EraseButton extends Button implements AddressAware, OnClickListener, OnLongClickListener{ private AddressText address; @@ -52,7 +52,7 @@ public class EraseButton extends Button implements OnClickListener, OnLongClickL return true; } - public void setAddressView(AddressText view) { + public void setAddressWidget(AddressText view) { address = view; }