From 4c9e604f88485fdc527f8ba3da37e6805d5d79e7 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 30 Nov 2011 12:29:05 +0100
Subject: [PATCH] Incall activity detail buttons

Clicking small imageviews on Android 1.5 is nearly impossible.
---
 res/drawable/conf_details.png            | Bin 0 -> 968 bytes
 res/layout/conf_callee.xml               |   1 +
 res/layout/conf_callee_older_devices.xml |  21 +++++++++++----------
 res/layout/incall_layout.xml             |   7 +++++--
 src/org/linphone/IncallActivity.java     |  14 +++++++++++++-
 5 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 res/drawable/conf_details.png

diff --git a/res/drawable/conf_details.png b/res/drawable/conf_details.png
new file mode 100644
index 0000000000000000000000000000000000000000..7168af5805aa2cd18028b9f4ea9bfc53814a5949
GIT binary patch
literal 968
zcmV;(12_DMP)<h;3K|Lk000e1NJLTq000^Q000*V1^@s671Uo400001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iprC
z2{JD_O9fT{00T%#L_t(Y$F-I}ZyQGt#ecKAM~N{(nNkrLE`)r6s8N+Ni4hl(OBRVB
zStKpSb-n=m07(@XCsDLzC=Hu*f{{X1zJQ7VZVg0$fx!G@g{H+l-lX7(JW>)8+sXik
zyB*x^+qXOO-ogJA`}_N->Uiv~8=zi)f)X?E5hC*6fSS!FOG`@>mhvnv7AP#<<nLaO
z_Ny+fc88a5UQ)bMBn(5uW)M}B7yuPBHP@v;ySux%V2;fE94_Msf&dp-L?9YO_{bCa
z2z%<NHy)$00tyoXd^8ta4HSkU);bg+2;BH`fg^AM-bZ*p0`cDCqbLEn80+inQ)80`
zF$oBO3mi7ExFEoZFrQK0i03RGa^^k5;gF$^E(OsvwOK~Srl=Z2K9}R}mv{g5@Wb#i
z#wnzT3Chmi9^2(|DhKTB?IAi^#n1}hZEd}CwS|oaCZ5j4qEr(wQ>)d+AgFmS5P)i_
zL_GA8W@c2V*XyI_+qaj`H<kwv?tf4ZRjXAMnWm*;lVV8ts?lp{*h-~>q>Dk7TCIjt
z9i{bRFMTXxzlme>+xGVTKSsIzPchNwR^*pbsq`1X&Q9Yi5tbJga!-oI;s79@zd`qP
zZ#?U*Tg#Ypl`!#iCyThB6@D}({&kX!pP};8Fy@D3F`tOx5FzZGo|evED;A4rYU$Pv
zF^n5dXL>=;l58)Pew%E3A0WzP2EZ^m`2O@tHMM&dBj=hl(_`8B%tIAjj{^Jk<csJF
zLB5US!S?_UH#bj==x2i5E0?#PPT{0#BDRVg930SpI{;uV<Jj2PxR#>WtvAN4dh+Ls
z5s%%y1}Nn6Ida*otgWr-hgn4(P1H?*N~JU!Wt;_pz*@4otUiDKyLn%bX0w^H2*FyJ
zi0bC%CN>z^K_&?B!(4oF^5WfPC=BVm?oH}SVJlIZsS-FmJfyI+K%sDx!r}tX1+-c%
zx~(3otE*Q6JbLsL=RBkwRS+tbt!YtB$MNwoH}Y8)3wZ`UqTTAyZg)rbR+s+S8LD82
ziIWLuBep_yMl&xs?8?dt0G)mZ-*4liiOKoMgKDBAGY|rzG39c3>R;hXMwi9W(GjmY
q9lEU!=R!{`VB)cJmQ&tyS^NVj`BN?t{X}H|0000<MNUMnLSTYv2e#S(

literal 0
HcmV?d00001

diff --git a/res/layout/conf_callee.xml b/res/layout/conf_callee.xml
index cf1210cfa..e46979919 100644
--- a/res/layout/conf_callee.xml
+++ b/res/layout/conf_callee.xml
@@ -27,6 +27,7 @@
 		<ImageView android:id="@+id/callee_status_secured" style="@style/callee_status" android:src="@drawable/conf_secured" android:visibility="gone"/>
 		<ImageView android:id="@+id/callee_status_maybe_secured" style="@style/callee_status" android:src="@drawable/conf_maybe_secured" android:visibility="gone"/>
 		<ImageView android:id="@+id/callee_status_not_secured" style="@style/callee_status" android:src="@drawable/conf_not_secured" android:visibility="gone"/>
+      	<ImageView android:id="@+id/callee_status_details" style="@style/callee_status" android:src="@drawable/conf_details" android:visibility="gone"/>
 	</LinearLayout>
 
 
diff --git a/res/layout/conf_callee_older_devices.xml b/res/layout/conf_callee_older_devices.xml
index 4b859a2e7..76b4b5494 100644
--- a/res/layout/conf_callee_older_devices.xml
+++ b/res/layout/conf_callee_older_devices.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="fill_parent" android:layout_height="52sp"
   android:background="@drawable/conf_callee_bg">
   
     <ImageView android:id="@+id/picture" android:layout_width="52sp"
      android:src="@drawable/unknown_person" android:layout_height="52sp"
-     android:paddingLeft="5px" android:scaleType="centerInside"/>
+     android:paddingRight="5dp" android:paddingLeft="5dp" android:scaleType="centerInside"/>
 
 
     <LinearLayout android:id="@+id/callee_block" android:orientation="vertical"
@@ -19,19 +19,16 @@
       </LinearLayout>
     </LinearLayout>
 
-	<View android:layout_height="fill_parent" android:layout_width="wrap_content" android:layout_weight="1"/>
 
 
-	<ImageButton android:id="@+id/addVideo" android:src="@drawable/conf_video"
-		android:layout_width="wrap_content" android:layout_height="wrap_content" />
-	<ImageButton android:id="@+id/merge_to_conference"
-		android:src="@drawable/conf_merge" android:layout_width="wrap_content"
-		android:layout_height="wrap_content" />
+    <LinearLayout android:id="@+id/callee_statuses"
+        android:layout_width="wrap_content" android:layout_height="wrap_content"
+        android:layout_alignParentRight="true" android:gravity="center_vertical">
 
 	<TextView android:id="@+id/status_label" style="@style/callee_status"
 		android:layout_height="fill_parent" />
 	<ImageView android:id="@+id/callee_status_paused" style="@style/callee_status"
-		android:src="@drawable/conf_status_paused" />
+		android:src="@drawable/conf_status_paused" android:visibility="gone" />
 
 	<ImageView android:id="@+id/callee_status_secured" style="@style/callee_status"
 	    android:src="@drawable/conf_secured" android:visibility="gone"/>
@@ -39,4 +36,8 @@
 	    android:src="@drawable/conf_maybe_secured" android:visibility="gone"/>
 	<ImageView android:id="@+id/callee_status_not_secured" style="@style/callee_status"
 	     android:src="@drawable/conf_not_secured" android:visibility="gone"/>
-</LinearLayout>
+
+	<ImageButton android:id="@+id/callee_status_details" style="@style/callee_status"
+	     android:src="@drawable/conf_details" android:visibility="gone"/>
+	</LinearLayout>
+</RelativeLayout>
diff --git a/res/layout/incall_layout.xml b/res/layout/incall_layout.xml
index ee186eaf8..bb96cc862 100644
--- a/res/layout/incall_layout.xml
+++ b/res/layout/incall_layout.xml
@@ -7,14 +7,17 @@
      android:orientation="vertical">
 
 	<LinearLayout android:id="@+id/conf_header" android:layout_alignParentTop="true"
-			android:orientation="vertical" android:layout_marginBottom="10dip"
+			android:layout_marginBottom="10dip"
 			android:layout_width="fill_parent" android:layout_height="wrap_content" 
 			android:layout_alignWithParentIfMissing="true"
 			android:minHeight="60sp"
 			android:background="@drawable/conf_callee_selector_normal" >
       	<TextView android:text="@string/conf_conference" style="@style/callee_address"
         	android:layout_width="fill_parent" android:layout_height="wrap_content" 
-        	android:gravity="center"/>
+        	android:gravity="center" android:layout_gravity="center_vertical" />
+      	<ImageButton android:id="@+id/conf_header_details"
+      	    android:layout_width="wrap_content" android:layout_height="fill_parent"
+      	    android:scaleType="center" android:src="@drawable/conf_details"/>
 	</LinearLayout>
 
 
diff --git a/src/org/linphone/IncallActivity.java b/src/org/linphone/IncallActivity.java
index 10db13675..24dddbfe8 100644
--- a/src/org/linphone/IncallActivity.java
+++ b/src/org/linphone/IncallActivity.java
@@ -109,6 +109,8 @@ public class IncallActivity extends AbstractCalleesActivity implements
 		mConferenceVirtualCallee = findViewById(R.id.conf_header);
 		mConferenceVirtualCallee.setOnClickListener(this);
 		mConferenceVirtualCallee.setOnLongClickListener(this);
+		enableView(mConferenceVirtualCallee, R.id.conf_header_details, this, true);
+
 
 		boolean mMayDoVideo = Version.isVideoCapable()
 		&& LinphoneManager.getInstance().isVideoEnabled();
@@ -216,7 +218,12 @@ public class IncallActivity extends AbstractCalleesActivity implements
 	
 	@Override
 	public boolean onLongClick(View v) {
-		if (v.getId() == R.id.conf_header) {
+		if (v.getId() == R.id.conf_header || v.getId() == R.id.conf_header_details) {
+			if (!lc().isInConference()) {
+				// make sure we are in the conference
+				// especially due to the difficulty to aim at the detail button.
+				lc().enterConference();
+			}
 			LinphoneActivity.instance().startConferenceDetailsActivity();
 			return true;
 		}
@@ -260,6 +267,9 @@ public class IncallActivity extends AbstractCalleesActivity implements
 			boolean enterConf = !lc().isInConference();
 			enterConferenceAndVirtualConfView(enterConf);
 			break;
+		case R.id.conf_header_details:
+			onLongClick(v);
+			break;
 		case R.id.incallNumpadShow:
 			showDialog(numpadDialogId);
 			break;
@@ -527,6 +537,8 @@ public class IncallActivity extends AbstractCalleesActivity implements
 
 			registerCallDurationTimer(v, call);
 
+			enableView(v, R.id.callee_status_details, showCallActionsSimpleListener, true);
+
 			return v;
 		}
 	}