From df8093eb939cc2caf115254dde4f20bf24e5e8bd Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 11 Oct 2011 14:28:42 +0200
Subject: [PATCH] Enhanced uri picker activity (image buttons)

---
 AndroidManifest.xml                     |   4 +++-
 res/drawable/picker_plus.png            | Bin 0 -> 426 bytes
 res/drawable/picker_transfer.png        | Bin 0 -> 1852 bytes
 res/layout/simplified_dialer.xml        |   3 ++-
 src/org/linphone/UriPickerActivity.java |   3 +++
 5 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 res/drawable/picker_plus.png
 create mode 100644 res/drawable/picker_transfer.png

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5efc5929c..79173267c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -44,7 +44,9 @@
             </intent-filter>
          </activity>
 
-        <activity android:name="org.linphone.UriPickerActivity" android:theme="@android:style/Theme.NoTitleBar">
+        <activity android:name="org.linphone.UriPickerActivity"
+        	android:theme="@android:style/Theme.NoTitleBar"
+        	android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
diff --git a/res/drawable/picker_plus.png b/res/drawable/picker_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..e75c7c27c42d18a9ed567a1fa36b8a00b45e0d3f
GIT binary patch
literal 426
zcmeAS@N?(olHy`uVBq!ia0vp^nn0|=!3HEn{t0UUDaPU;cPEB*=VV?2Ic!PZ?k)`f
zL2$v|<&%LToCO|{#X#-XL734=V|E2lkiEpy*OmP?7dJPT;MQsXN`a<mdAc};L>zuQ
z-QLUDQJ{T)EvM73T20%g+yl36O|D=lX3l@;_=d%C!khzIp<S{~t%@46HlEO~nK6SW
z|MMrN&&_Ma+Vac(>FtQQ8<dgf)WC6q<HxU3!`S#^>we6dr=aOkI;m+-xSvT~M_t?W
zJ*;~F**w^@AKZ}GbmBwLY2BG24D&4?h0Jk!XtBiED#h+Z%Epg#*<E$c+AyjrtUqu&
z@3GaN^j+T^=QZBrQ#S6n-gZ+r{eX<bmN|UM9p%+d%d|Q8b(ha=V$(Q0&r<S>#qEd<
zB7O5*O52qSRtOr|FmWeb{q)J!EM)suRzsF^+wZJxn7&N+#GMFpi_+lxr?Q_PPB^}6
zX7oSRh11m^E!CIcdpRMtc}}Rav$@X%&-NN$@vr}8h+Nvc_qkk1)9I<6_Le~rsX69?
RcYp!O;OXk;vd$@?2>|_es-6G<

literal 0
HcmV?d00001

diff --git a/res/drawable/picker_transfer.png b/res/drawable/picker_transfer.png
new file mode 100644
index 0000000000000000000000000000000000000000..0251581f3c70e7838854757fddf9beb7436e6007
GIT binary patch
literal 1852
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

literal 0
HcmV?d00001

diff --git a/res/layout/simplified_dialer.xml b/res/layout/simplified_dialer.xml
index 1ffee31fa..9c6632fcc 100644
--- a/res/layout/simplified_dialer.xml
+++ b/res/layout/simplified_dialer.xml
@@ -26,10 +26,11 @@
 	<LinearLayout android:gravity="bottom"
 		android:layout_height="wrap_content" android:layout_width="fill_parent">
 		<Button android:id="@+id/AddCallButton" android:text="@string/AddCallButtonText"
+			android:gravity="bottom|center_horizontal"
 			android:layout_height="fill_parent" android:layout_width="fill_parent"
 			android:layout_weight="1" android:background="@drawable/clavier_bg" />
 		<Button android:id="@+id/AddCallCancelButton" android:text="@string/CancelButtonText"
-			android:layout_height="fill_parent" android:layout_width="fill_parent"
+			android:layout_height="wrap_content" android:layout_width="fill_parent"
 			android:layout_weight="1" android:background="@drawable/clavier_bg" />
 	</LinearLayout>
 
diff --git a/src/org/linphone/UriPickerActivity.java b/src/org/linphone/UriPickerActivity.java
index dad28f6b3..cbe48fe77 100644
--- a/src/org/linphone/UriPickerActivity.java
+++ b/src/org/linphone/UriPickerActivity.java
@@ -115,11 +115,14 @@ public class UriPickerActivity extends TabActivity implements ContactPicked {
 			mAddress = (AddressText) findViewById(R.id.SipUri);
 
 			addButton = (Button) findViewById(R.id.AddCallButton);
+//			addButton.setCompoundDrawablePadding(100);
 			addButton.setOnClickListener(this);
 			String type = getIntent().getStringExtra(EXTRA_PICKER_TYPE);
 			if (EXTRA_PICKER_TYPE_ADD.equals(type)) {
+				addButton.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.picker_plus, 0, 0);
 				addButton.setText(getString(R.string.AddCallButtonText));
 			} else if (EXTRA_PICKER_TYPE_TRANSFER.equals(type)) {
+				addButton.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.picker_transfer, 0, 0);
 				addButton.setText(getString(R.string.TransferCallButtonText));
 			} else {
 				throw new RuntimeException("unknown type");