From ae11cbfcaa891dbea032d28650c45f7522b609f0 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Mon, 29 Feb 2016 17:12:25 +0100
Subject: [PATCH] Fix ui details

---
 res/drawable-xhdpi/menu_disabled.png          | Bin 405 -> 503 bytes
 res/layout-land/dialer.xml                    |  93 ++++++++++++++++++
 res/layout-land/launch_screen.xml             |  50 ++++++++++
 .../linphone/assistant/AssistantActivity.java |   4 +-
 4 files changed, 145 insertions(+), 2 deletions(-)
 create mode 100644 res/layout-land/dialer.xml
 create mode 100644 res/layout-land/launch_screen.xml

diff --git a/res/drawable-xhdpi/menu_disabled.png b/res/drawable-xhdpi/menu_disabled.png
index e56d747f12529429cfeaa7b1dd1a78827c99bb11..afe4c19b0000a994cb27ba29ddb711a8fdbc2a4c 100644
GIT binary patch
delta 452
zcmV;#0XzPc1NQ?ViBL{Q4GJ0x0000DNk~Le0000t0000s2nGNE0Aq&%<B=g73a|hG
z4X^=yWm)=>Mks%DNkl<ZXo2n8!A=uV6b9h$3<F3dh*ns*(l;=^|1%gLz`cnG5o20P
zh2!G3gw(hpLvChrztv3A#eXu>$vL?vATtkejsxR&i|-L}8=JyD;YH<8L%PA|4riuS
z7^R-G4p}?NGszwoc!#6PVTQECML=fm<1M<Xk%n=P9}$1Ct{tRlnx<)*CyK{6nHm54
z;aEh(L$ADTzh+8r+1Cm+pg&kf#G>EKbMH;8x6I719Zr=gd<un8>Nv+~hrP;Sp37d3
zYy84-<uF6~jqB|P<u%@z#;bXcEBve-q-mO_X__b6o##g1XGX-`!!=~)Txq{XUmWg~
z_Uo$8%wvCiz)L$%a-<Tku<CJQS`$Gi^_+B=>S@TjS4M+xn48Xj?$V=q?npUmoyt6S
z6A{bWL7Jv%nx<*~wQau+m6MVEx^V`vR`xAd+kMNAI5eGkZiO$sa_Bg#n`dw{n|;fv
u%1+t0T+~i7u!Ws{%em>ybC(gZ{tIsyX0`W*Sjh|k0000<MNUMnLSTa1f!2Qj

delta 353
zcmV-n0iOQ%1C;|IiBL{Q4GJ0x0000DNk~Le0000u0000t2nGNE09nw9%aI`)3b+6O
z4Y&bW?@^zTMks$0Nkl<ZXo2n8J!`{25QO1(&L;jW0{Q<xF_6Zx64}}mii}*OF+L72
z^HeHlIV5hx3Lqj1umuV^j6g4GR742)09K7dJ=+!doKG&>a4^lZEr41lsi^>GrsK@!
z3iN`zk4z@Lq_K4fGcz-@$K74D|Ekl=lN7gSfQUE%2l9V3ivUiNPV0zx1CFf|J(+-G
zL<|L3w@y>hx&TA#6cr8gJGck-<a!4?NnPt8W@ct)k8>Y<QMW#*h}Zz{trJ!9mAwzH
z3h>i9MMZaga7V5sgig}Abr3T%Gc)_wa#w9fp0&y=aGn=p3)4bumW%dmWU&yNZ8(@_
z+7_mIpH(Ropa(9klT>hFu@Ea@L$04r-;&}NBO6*TSjHCN00000NkvXXu0mjf*~5*y

diff --git a/res/layout-land/dialer.xml b/res/layout-land/dialer.xml
new file mode 100644
index 000000000..4aabdefc7
--- /dev/null
+++ b/res/layout-land/dialer.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:background="@color/colorH"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+	<RelativeLayout
+		android:id="@+id/address_bar"
+		android:background="@color/colorF"
+		android:layout_width="match_parent"
+		android:layout_height="60dp"
+		android:layout_marginBottom="10dp"
+		android:layout_alignParentTop="true">
+
+		<org.linphone.ui.EraseButton
+			android:id="@+id/erase"
+			android:src="@drawable/backspace"
+			android:layout_width="40dp"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_centerVertical="true"
+			android:layout_marginRight="10dp"
+			android:layout_marginLeft="10dp" />
+
+		<org.linphone.ui.AddressText
+			android:id="@+id/address"
+			android:background="@color/colorF"
+			android:textColorHint="@color/colorE"
+			style="@style/font5"
+			android:ellipsize="start"
+			android:inputType="textEmailAddress"
+			android:hint="@string/address_bar_hint"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:paddingLeft="20dp"
+			android:paddingRight="5dp"
+			android:layout_toLeftOf="@id/erase"
+			android:layout_centerVertical="true"/>
+
+	</RelativeLayout>
+
+	<org.linphone.ui.Numpad
+		android:id="@+id/numpad"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:padding="10dp"
+		android:visibility="gone"
+		android:layout_above="@id/controls"
+		android:layout_below="@id/address_bar"
+		android:layout_centerInParent="true"/>
+
+	<ImageView
+		android:src="@drawable/dialer_background"
+		android:layout_centerHorizontal="true"
+		android:layout_width="100dp"
+		android:layout_height="wrap_content"/>
+    
+    <LinearLayout
+        android:id="@+id/controls"
+        android:layout_alignParentBottom="true"
+        android:layout_width="match_parent"
+        android:layout_height="60dp">
+
+		<RelativeLayout
+			android:focusable="true"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:adjustViewBounds="true">
+
+			<ImageView
+				android:id="@+id/add_contact"
+				android:src="@drawable/contact_add_button"
+				android:background="@drawable/toolbar_button"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:padding="15dp"
+				android:layout_alignParentBottom="true"/>
+
+		</RelativeLayout>
+
+        <org.linphone.ui.CallButton
+			android:id="@+id/call"
+			android:src="@drawable/call_audio_start"
+			android:background="@drawable/call"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+			android:padding="12dp"
+            android:layout_weight="0.5"/>
+
+	</LinearLayout>
+
+</RelativeLayout>
diff --git a/res/layout-land/launch_screen.xml b/res/layout-land/launch_screen.xml
new file mode 100644
index 000000000..73f2dff52
--- /dev/null
+++ b/res/layout-land/launch_screen.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:background="@color/colorC"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="20dp"
+		android:layout_gravity="center_horizontal"
+		android:orientation="vertical">
+
+		<ImageView
+			android:src="@drawable/splashscreen"
+			android:layout_width="100dp"
+			android:layout_height="100dp"
+			android:layout_gravity="center_horizontal"/>
+
+		<TextView
+			android:text="@string/app_name"
+			style="@style/font21"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="5dp"
+			android:layout_gravity="center"/>
+
+		<TextView
+			android:text="@string/app_description"
+			android:textSize="28sp"
+			android:textColor="@color/colorA"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"/>
+
+	</LinearLayout>
+
+    <ProgressBar 
+        android:layout_height="wrap_content" 
+        android:layout_width="wrap_content"
+		android:layout_marginBottom="20dp"
+        android:layout_gravity="center_horizontal|bottom" />
+
+	<View
+		android:background="@color/colorA"
+		android:layout_height="10dp"
+		android:layout_width="100dp"
+		android:layout_gravity="center_horizontal|bottom" />
+
+</FrameLayout>
diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java
index c4f45c5fd..68a897502 100644
--- a/src/org/linphone/assistant/AssistantActivity.java
+++ b/src/org/linphone/assistant/AssistantActivity.java
@@ -89,9 +89,9 @@ public class AssistantActivity extends Activity implements OnClickListener {
             }
         }
         mPrefs = LinphonePreferences.instance();
-		if(mPrefs.isFirstLaunch()) {
+		//if(mPrefs.isFirstLaunch()) {
 			status.enableSideMenu(false);
-		}
+		//}
         
         mListener = new LinphoneCoreListenerBase(){
         	@Override