From e744c9d12ba89f16bab0b82448e06fffda36c3a3 Mon Sep 17 00:00:00 2001
From: Brieuc Viel <brieuc.viel@belledonne-communications.com>
Date: Fri, 29 Apr 2016 18:38:32 +0200
Subject: [PATCH] update video UI

---
 res/layout-land/call.xml         |   6 +-
 res/layout-sw533dp-land/call.xml | 129 +++++++++++++++----------------
 res/layout-sw533dp/call.xml      |  79 +++++++++----------
 res/layout/call.xml              |  78 ++++++++++---------
 4 files changed, 144 insertions(+), 148 deletions(-)

diff --git a/res/layout-land/call.xml b/res/layout-land/call.xml
index 450293da2..1d9cd7ebb 100644
--- a/res/layout-land/call.xml
+++ b/res/layout-land/call.xml
@@ -24,7 +24,7 @@
 			<FrameLayout
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
-				android:layout_above="@+id/call_bar">
+                android:layout_alignBottom="@+id/menu_bottom">
 
 				<RelativeLayout
 					android:layout_width="match_parent"
@@ -188,7 +188,7 @@
 			</FrameLayout>
 
             <LinearLayout
-                android:id="@+id/call_bar"
+                android:id="@+id/menu"
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
                 android:layout_alignParentBottom="true"
@@ -233,7 +233,7 @@
                 </LinearLayout>
 
                 <LinearLayout
-                    android:id="@+id/menu"
+
                     android:layout_width="match_parent"
                     android:layout_weight="1"
                     android:layout_height="60dp"
diff --git a/res/layout-sw533dp-land/call.xml b/res/layout-sw533dp-land/call.xml
index c9994dafb..0a4cabf75 100644
--- a/res/layout-sw533dp-land/call.xml
+++ b/res/layout-sw533dp-land/call.xml
@@ -24,7 +24,7 @@
 			<FrameLayout
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
-				android:layout_above="@+id/call_bar">
+                android:layout_above="@+id/menu">
 
 				<RelativeLayout
 					android:layout_width="match_parent"
@@ -190,7 +190,7 @@
 			</FrameLayout>
 
             <LinearLayout
-                android:id="@+id/call_bar"
+                android:id="@+id/menu"
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
                 android:layout_alignParentBottom="true"
@@ -201,7 +201,7 @@
                     android:id="@+id/main_bar"
                     android:layout_width="match_parent"
                     android:layout_height="60dp"
-                    android:layout_weight="0.3"
+                    android:layout_weight="0.6"
                     android:orientation="horizontal" >
 
                     <ImageView
@@ -233,83 +233,76 @@
 
                 </LinearLayout>
 
-                <LinearLayout
-                    android:id="@+id/menu"
+                 <LinearLayout
+                    android:background="@color/colorF"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.7"
-                    android:orientation="vertical">
+                    android:layout_height="60dp"
+                    android:orientation="horizontal"
+                    android:layout_weight="1">
 
-                    <LinearLayout
-                        android:background="@color/colorF"
+                    <RelativeLayout
+                        android:background="@drawable/button_background"
                         android:layout_width="match_parent"
-                        android:layout_height="60dp"
-                        android:orientation="horizontal">
-
-                        <RelativeLayout
-                            android:background="@drawable/button_background"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1">
-
-                            <ImageView
-                                android:id="@+id/video"
-                                android:src="@drawable/camera_default"
-                                android:background="@drawable/button_background"
-                                android:padding="20dp"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"/>
-
-                            <ProgressBar
-                                android:id="@+id/video_in_progress"
-                                style="?android:attr/progressBarStyle"
-                                android:layout_centerHorizontal="true"
-                                android:layout_centerVertical="true"
-                                android:visibility="gone"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"/>
-
-                        </RelativeLayout>
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1">
 
                         <ImageView
-                            android:id="@+id/micro"
-                            android:src="@drawable/micro_default"
+                            android:id="@+id/video"
+                            android:src="@drawable/camera_default"
                             android:background="@drawable/button_background"
-                            android:padding="12dp"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1" />
-
-                        <ImageView
-                            android:id="@+id/speaker"
-                            android:src="@drawable/speaker_default"
-                            android:background="@drawable/button_background"
-                            android:padding="15dp"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1" />
-
-                        <ImageView
-                            android:id="@+id/audio_route"
-                            android:src="@drawable/routes"
-                            android:background="@drawable/button_background"
-                            android:visibility="gone"
                             android:padding="20dp"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1" />
+                            android:layout_height="wrap_content"/>
 
-                        <ImageView
-                            android:id="@+id/options"
-                            android:src="@drawable/options_default"
-                            android:background="@drawable/button_background"
-                            android:padding="15dp"
+                        <ProgressBar
+                            android:id="@+id/video_in_progress"
+                            style="?android:attr/progressBarStyle"
+                            android:layout_centerHorizontal="true"
+                            android:layout_centerVertical="true"
+                            android:visibility="gone"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1" />
-                    </LinearLayout>
+                            android:layout_height="wrap_content"/>
 
+                    </RelativeLayout>
+
+                    <ImageView
+                        android:id="@+id/micro"
+                        android:src="@drawable/micro_default"
+                        android:background="@drawable/button_background"
+                        android:padding="12dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:id="@+id/speaker"
+                        android:src="@drawable/speaker_default"
+                        android:background="@drawable/button_background"
+                        android:padding="15dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:id="@+id/audio_route"
+                        android:src="@drawable/routes"
+                        android:background="@drawable/button_background"
+                        android:visibility="gone"
+                        android:padding="20dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:id="@+id/options"
+                        android:src="@drawable/options_default"
+                        android:background="@drawable/button_background"
+                        android:padding="15dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1" />
                 </LinearLayout>
+
             </LinearLayout>
 
                 <LinearLayout
diff --git a/res/layout-sw533dp/call.xml b/res/layout-sw533dp/call.xml
index ee33e6d51..13cfde375 100644
--- a/res/layout-sw533dp/call.xml
+++ b/res/layout-sw533dp/call.xml
@@ -162,13 +162,13 @@
 					</LinearLayout>
 
                     <LinearLayout
+                        android:id="@+id/calls_list"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="horizontal"
                         android:layout_alignParentBottom="true">
 
                         <LinearLayout
-                            android:id="@+id/calls_list"
                             android:background="@color/colorG"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -196,54 +196,55 @@
                 android:layout_gravity="center"
                 android:orientation="horizontal" >
 
-                <LinearLayout
-                    android:id="@+id/main_bar"
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:layout_weight="0.5"
-                    android:orientation="horizontal" >
-
-                    <ImageView
-                        android:id="@+id/dialer"
-                        android:src="@drawable/dialer"
-                        android:background="@color/colorC"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0.6"
-                        android:padding="15dp" />
-
-                    <ImageView
-                        android:id="@+id/chat"
-                        android:src="@drawable/chat"
-                        android:background="@color/colorC"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0.6"
-                        android:padding="15dp"/>
-                    <ImageView
-                        android:id="@+id/hang_up"
-                        android:src="@drawable/call_hangup"
-                        android:background="@drawable/hangup"
-                        android:layout_gravity="center"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0.4"
-                        android:padding="12dp"/>
-
-                </LinearLayout>
-
                 <LinearLayout
                     android:id="@+id/menu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.5"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:id="@+id/main_bar"
+                        android:layout_width="match_parent"
+                        android:layout_height="60dp"
+                        android:layout_weight="1"
+                        android:orientation="horizontal" >
+
+                        <ImageView
+                            android:id="@+id/dialer"
+                            android:src="@drawable/dialer"
+                            android:background="@color/colorC"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:padding="15dp" />
+
+                        <ImageView
+                            android:id="@+id/chat"
+                            android:src="@drawable/chat"
+                            android:background="@color/colorC"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:padding="15dp"/>
+                        <ImageView
+                            android:id="@+id/hang_up"
+                            android:src="@drawable/call_hangup"
+                            android:background="@drawable/hangup"
+                            android:layout_gravity="center"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:padding="12dp"/>
+
+                    </LinearLayout>
 
                     <LinearLayout
                         android:background="@color/colorF"
                         android:layout_width="match_parent"
                         android:layout_height="60dp"
-                        android:orientation="horizontal">
+                        android:layout_weight="1"
+                        android:orientation="horizontal" >
 
                         <RelativeLayout
                             android:background="@drawable/button_background"
diff --git a/res/layout/call.xml b/res/layout/call.xml
index 94d3c2aa5..68756395a 100644
--- a/res/layout/call.xml
+++ b/res/layout/call.xml
@@ -175,48 +175,12 @@
 				</RelativeLayout>
 			</FrameLayout>
 
-			<LinearLayout
-				android:id="@+id/main_bar"
-				android:layout_width="match_parent"
-				android:layout_height="60dp"
-				android:layout_alignParentBottom="true"
-				android:layout_gravity="center"
-				android:orientation="horizontal" >
-
-				<ImageView
-					android:id="@+id/dialer"
-					android:src="@drawable/dialer"
-					android:background="@color/colorC"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="0.8"
-					android:padding="15dp" />
-
-				<ImageView
-					android:id="@+id/hang_up"
-					android:src="@drawable/call_hangup"
-					android:background="@drawable/hangup"
-					android:layout_gravity="center"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="0.4"
-					android:padding="12dp"/>
-
-				<ImageView
-					android:id="@+id/chat"
-					android:src="@drawable/chat"
-					android:background="@color/colorC"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="0.8"
-					android:padding="15dp"/>
-			</LinearLayout>
 
 			<LinearLayout
                 android:id="@+id/menu"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-				android:layout_above="@id/main_bar"
+                android:layout_alignParentBottom="true"
                 android:orientation="vertical">
 
                 <LinearLayout
@@ -288,7 +252,45 @@
                     android:layout_weight="1" />
             </LinearLayout>
 
-        </LinearLayout>
+                <LinearLayout
+                    android:id="@+id/main_bar"
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:layout_alignParentBottom="true"
+                    android:layout_gravity="center"
+                    android:orientation="horizontal" >
+
+                    <ImageView
+                        android:id="@+id/dialer"
+                        android:src="@drawable/dialer"
+                        android:background="@color/colorC"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.8"
+                        android:padding="15dp" />
+
+                    <ImageView
+                        android:id="@+id/hang_up"
+                        android:src="@drawable/call_hangup"
+                        android:background="@drawable/hangup"
+                        android:layout_gravity="center"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.4"
+                        android:padding="12dp"/>
+
+                    <ImageView
+                        android:id="@+id/chat"
+                        android:src="@drawable/chat"
+                        android:background="@color/colorC"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.8"
+                        android:padding="15dp"/>
+                </LinearLayout>
+
+
+            </LinearLayout>
 
 			<LinearLayout
                 android:id="@+id/menu_bottom"