From 7e1856bab2d1341a9303a4bd4eb3dad3517e8eb0 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Wed, 5 Sep 2012 15:45:59 +0200
Subject: [PATCH] Improved incall status bar

---
 res/layout-land/incall.xml           | 30 +++++++++++++++++----------
 res/layout/incall.xml                | 31 +++++++++++++++++-----------
 res/layout/status.xml                |  6 ++++--
 src/org/linphone/InCallActivity.java |  4 ++--
 src/org/linphone/StatusFragment.java |  8 ++++---
 5 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/res/layout-land/incall.xml b/res/layout-land/incall.xml
index b917d3f9a..de29df1d7 100644
--- a/res/layout-land/incall.xml
+++ b/res/layout-land/incall.xml
@@ -5,11 +5,26 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
-        android:id="@+id/fragmentContainer"
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="horizontal" />
+        android:layout_alignParentTop="true">
+
+        <LinearLayout
+            android:id="@+id/fragmentContainer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            android:paddingTop="40dp" />
+
+        <fragment
+            android:id="@+id/status"
+            android:name="org.linphone.StatusFragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:layout="@layout/status" />
+        
+    </FrameLayout>
 
     <ImageView
         android:id="@+id/switchCamera"
@@ -17,16 +32,9 @@
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:contentDescription="@string/content_description_switch_camera"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="40dp"
         android:src="@drawable/switch_camera"
         android:visibility="invisible" />
-
-    <fragment
-        android:id="@+id/status"
-        android:name="org.linphone.StatusFragment"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        tools:layout="@layout/status" />
     
     <org.linphone.ui.Numpad
         android:id="@+id/numpad"
diff --git a/res/layout/incall.xml b/res/layout/incall.xml
index 5b5b3d87f..255ed2ad9 100644
--- a/res/layout/incall.xml
+++ b/res/layout/incall.xml
@@ -5,11 +5,26 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     
-    <LinearLayout
-        android:id="@+id/fragmentContainer"
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="horizontal" />
+        android:layout_alignParentTop="true">
+
+        <LinearLayout
+            android:id="@+id/fragmentContainer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            android:paddingTop="40dp" />
+
+        <fragment
+            android:id="@+id/status"
+            android:name="org.linphone.StatusFragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:layout="@layout/status" />
+        
+    </FrameLayout>
 
     <ImageView
         android:id="@+id/switchCamera"
@@ -17,17 +32,9 @@
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:contentDescription="@string/content_description_switch_camera"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="40dp"
         android:visibility="invisible"
         android:src="@drawable/switch_camera" />
-
-    <fragment
-        android:id="@+id/status"
-        android:name="org.linphone.StatusFragment"
-        android:layout_alignParentTop="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        tools:layout="@layout/status" />
     
     <org.linphone.ui.Numpad
         android:id="@+id/numpad"
diff --git a/res/layout/status.xml b/res/layout/status.xml
index 5216d84a2..b87e1630b 100644
--- a/res/layout/status.xml
+++ b/res/layout/status.xml
@@ -68,7 +68,8 @@
 		        android:contentDescription="@string/content_description_call_quality"
 		        android:id="@+id/callQuality"
 		        android:layout_width="wrap_content"
-		        android:layout_height="match_parent"
+		        android:layout_height="wrap_content"
+		        android:layout_centerVertical="true"
 		        android:src="@drawable/call_quality_indicator_0" 
 		        android:adjustViewBounds="true"
 		        android:layout_centerHorizontal="true"
@@ -78,7 +79,8 @@
 		        android:contentDescription="@string/content_description_encryption"
 		        android:id="@+id/encryption"
 		        android:layout_width="wrap_content"
-		        android:layout_height="match_parent"
+		        android:layout_height="wrap_content"
+		        android:layout_centerVertical="true"
 		        android:src="@drawable/security_pending" 
 		        android:adjustViewBounds="true"
 		        android:visibility="gone"
diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java
index 43d26646f..e60e2d136 100644
--- a/src/org/linphone/InCallActivity.java
+++ b/src/org/linphone/InCallActivity.java
@@ -663,7 +663,7 @@ public class InCallActivity extends FragmentActivity implements
 				mHandler.post(new Runnable() {
 					@Override
 					public void run() {
-						status.refreshStatusItems(call);
+						status.refreshStatusItems(call, isVideoEnabled);
 					}
 				});
 			}
@@ -696,7 +696,7 @@ public class InCallActivity extends FragmentActivity implements
 			mHandler.post(new Runnable() {
 				@Override
 				public void run() {
-					status.refreshStatusItems(call);
+					status.refreshStatusItems(call, call.getCurrentParamsCopy().getVideoEnabled());
 				}
 			});
 		}
diff --git a/src/org/linphone/StatusFragment.java b/src/org/linphone/StatusFragment.java
index 128bd19e5..bdbd8e748 100644
--- a/src/org/linphone/StatusFragment.java
+++ b/src/org/linphone/StatusFragment.java
@@ -271,7 +271,7 @@ public class StatusFragment extends Fragment {
 		if (isInCall) {
 			LinphoneCall call = LinphoneManager.getLc().getCurrentCall();
 			startCallQuality();
-			refreshStatusItems(call);
+			refreshStatusItems(call, call.getCurrentParamsCopy().getVideoEnabled());
 			
 			// We are obviously connected
 			statusLed.setImageResource(R.drawable.led_connected);
@@ -299,14 +299,16 @@ public class StatusFragment extends Fragment {
 		}
 	}
 	
-	public void refreshStatusItems(LinphoneCall call) {
+	public void refreshStatusItems(LinphoneCall call, boolean isVideoEnabled) {
 		if (call != null && encryption != null) {
 			MediaEncryption mediaEncryption = call.getCurrentParamsCopy().getMediaEncryption();
 			Log.e("MediaEncryption = " + mediaEncryption);
 
 			exit.setVisibility(View.GONE);
 			statusText.setVisibility(View.GONE);
-			background.setVisibility(View.GONE);
+			if (isVideoEnabled) {
+				background.setVisibility(View.GONE);
+			}
 			encryption.setVisibility(View.VISIBLE);
 			
 			if (mediaEncryption == MediaEncryption.SRTP || (mediaEncryption == MediaEncryption.ZRTP && call.isAuthenticationTokenVerified())) {