From 7b0ae3830e118bf262592f8d9c83ce74c3d979b3 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Fri, 1 Aug 2014 11:25:59 +0200
Subject: [PATCH 1/2] fix headers alignment between contact and history views

---
 res/layout/contacts_list.xml  | 270 +++++++++++++++++-----------------
 res/layout/history.xml        | 224 ++++++++++++++--------------
 res/layout/history_simple.xml | 234 ++++++++++++++---------------
 3 files changed, 364 insertions(+), 364 deletions(-)

diff --git a/res/layout/contacts_list.xml b/res/layout/contacts_list.xml
index 7d9eb902b..dff28a174 100644
--- a/res/layout/contacts_list.xml
+++ b/res/layout/contacts_list.xml
@@ -1,138 +1,138 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-  	android:background="@drawable/background"
-    android:orientation="vertical" >
-    
-    <LinearLayout 
-	    android:layout_width="match_parent"
-	    android:layout_height="wrap_content"
-	    android:orientation="horizontal"
-	    android:background="@drawable/toolsbar_background">
-	    
-        <TextView 
-            android:visibility="invisible"
-            android:paddingTop="20dp"
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent"
-		    android:scaleType="centerCrop"
-		    android:adjustViewBounds="true"
-		    android:layout_weight="1"/>
-        
-        <TextView 
-            android:contentDescription="@string/content_description_all_contacts"
-            android:id="@+id/allContacts"
-            android:background="@drawable/contacts_all"
-            android:text="@string/button_all_contacts"
-            android:gravity="center"
-            android:paddingTop="20dp"
-            android:textSize="13sp"
-            android:textColor="@drawable/text_switch_button_color"
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent"
-		    android:scaleType="centerCrop"
-		    android:adjustViewBounds="true"
-		    android:layout_weight="1"/>
-        
-        <TextView 
-            android:contentDescription="@string/content_description_linphone_contacts"
-            android:id="@+id/linphoneContacts"
-            android:background="@drawable/contacts_sip"
-            android:text="@string/button_sip_contacts"
-            android:gravity="center"
-            android:paddingTop="20dp"
-            android:textSize="13sp"
-            android:textColor="@drawable/text_switch_button_color"
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent"
-		    android:scaleType="centerCrop"
-		    android:adjustViewBounds="true"
-		    android:layout_weight="1"/>
-        
-        <TextView 
-            android:contentDescription="@string/content_description_add_contact"
-            android:id="@+id/newContact"
-            android:background="@drawable/contacts_add_contact"
-            android:text="@string/button_add_contact"
-            android:gravity="center"
-            android:paddingTop="20dp"
-            android:textSize="13sp"
-            android:textColor="@drawable/text_button"
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent"
-		    android:scaleType="centerCrop"
-		    android:adjustViewBounds="true"
-		    android:layout_weight="1"/>
-        
-    </LinearLayout>
-    
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-	    
-	    <ImageView 
-	        android:contentDescription="@string/content_description_cancel"
-	        android:id="@+id/clearSearchField"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:adjustViewBounds="true"
-	        android:src="@drawable/list_delete"
-	        android:layout_centerVertical="true"
-	        android:layout_alignParentRight="true"
-	        android:paddingLeft="5dp"
-	        android:paddingRight="5dp"/>
-        
-	    <EditText
-            android:textCursorDrawable="@null"
-	        android:id="@+id/searchField"
-	        android:layout_width="match_parent"
-	        android:layout_height="wrap_content"
-	        android:textColor="@android:color/black"
-	        android:background="@drawable/chat_fast_address_background"
-	        android:gravity="center"
-	        android:layout_toLeftOf="@id/clearSearchField"
-	        android:paddingRight="5dp"
-	        android:inputType="textPersonName"/>
-	    
-    </RelativeLayout>
-    
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        
-	    <ListView 
-	        android:id="@+id/contactsList"
-	        android:layout_width="match_parent"
-	        android:layout_height="match_parent"
-	        android:divider="@android:color/darker_gray"
-	        android:cacheColorHint="@color/transparent"
-		    android:fastScrollAlwaysVisible="true"
-		    android:fastScrollEnabled="true"
-	        android:dividerHeight="1dp" />
-	    
-	    <TextView 
-	        android:id="@+id/noSipContact"
-	        android:visibility="gone"
-	        android:layout_width="match_parent"
-	        android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_centerVertical="true"
-	        android:text="@string/no_sip_contact"
-	        android:textColor="@drawable/text_color"
-	        android:textAppearance="@android:style/TextAppearance.Large"/>
-	    
-	    <TextView 
-	        android:id="@+id/noContact"
-	        android:visibility="gone"
-	        android:layout_width="match_parent"
-	        android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_centerVertical="true"
-	        android:text="@string/no_contact"
-	        android:textColor="@drawable/text_color"
-	        android:textAppearance="@android:style/TextAppearance.Large"/>
-        
-    </RelativeLayout>
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@drawable/background"
+	android:orientation="vertical" >
 
-</LinearLayout>
\ No newline at end of file
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:background="@drawable/toolsbar_background">
+
+		<TextView
+			android:visibility="invisible"
+			android:paddingTop="20dp"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:scaleType="centerCrop"
+			android:adjustViewBounds="true"
+			android:layout_weight="1"/>
+
+		<TextView
+			android:contentDescription="@string/content_description_all_contacts"
+			android:id="@+id/allContacts"
+			android:background="@drawable/contacts_all"
+			android:text="@string/button_all_contacts"
+			android:gravity="center"
+			android:paddingTop="20dp"
+			android:textSize="13sp"
+			android:textColor="@drawable/text_switch_button_color"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:scaleType="centerCrop"
+			android:adjustViewBounds="true"
+			android:layout_weight="1"/>
+
+		<TextView
+			android:contentDescription="@string/content_description_linphone_contacts"
+			android:id="@+id/linphoneContacts"
+			android:background="@drawable/contacts_sip"
+			android:text="@string/button_sip_contacts"
+			android:gravity="center"
+			android:paddingTop="20dp"
+			android:textSize="13sp"
+			android:textColor="@drawable/text_switch_button_color"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:scaleType="centerCrop"
+			android:adjustViewBounds="true"
+			android:layout_weight="1"/>
+
+		<TextView
+			android:contentDescription="@string/content_description_add_contact"
+			android:id="@+id/newContact"
+			android:background="@drawable/contacts_add_contact"
+			android:text="@string/button_add_contact"
+			android:gravity="center"
+			android:paddingTop="20dp"
+			android:textSize="13sp"
+			android:textColor="@drawable/text_button"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:scaleType="centerCrop"
+			android:adjustViewBounds="true"
+			android:layout_weight="1"/>
+
+	</LinearLayout>
+
+	<RelativeLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<ImageView
+			android:contentDescription="@string/content_description_cancel"
+			android:id="@+id/clearSearchField"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:adjustViewBounds="true"
+			android:src="@drawable/list_delete"
+			android:layout_centerVertical="true"
+			android:layout_alignParentRight="true"
+			android:paddingLeft="5dp"
+			android:paddingRight="5dp"/>
+
+		<EditText
+			android:textCursorDrawable="@null"
+			android:id="@+id/searchField"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:textColor="@android:color/black"
+			android:background="@drawable/chat_fast_address_background"
+			android:gravity="center"
+			android:layout_toLeftOf="@id/clearSearchField"
+			android:paddingRight="5dp"
+			android:inputType="textPersonName"/>
+
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent">
+
+		<ListView
+			android:id="@+id/contactsList"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:divider="@android:color/darker_gray"
+			android:cacheColorHint="@color/transparent"
+			android:fastScrollAlwaysVisible="true"
+			android:fastScrollEnabled="true"
+			android:dividerHeight="1dp" />
+
+		<TextView
+			android:id="@+id/noSipContact"
+			android:visibility="gone"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:gravity="center"
+			android:layout_centerVertical="true"
+			android:text="@string/no_sip_contact"
+			android:textColor="@drawable/text_color"
+			android:textAppearance="@android:style/TextAppearance.Large"/>
+
+		<TextView
+			android:id="@+id/noContact"
+			android:visibility="gone"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:gravity="center"
+			android:layout_centerVertical="true"
+			android:text="@string/no_contact"
+			android:textColor="@drawable/text_color"
+			android:textAppearance="@android:style/TextAppearance.Large"/>
+
+	</RelativeLayout>
+
+</LinearLayout>
diff --git a/res/layout/history.xml b/res/layout/history.xml
index df3f24b62..c6deac8fe 100644
--- a/res/layout/history.xml
+++ b/res/layout/history.xml
@@ -1,115 +1,115 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-  	android:background="@drawable/background"
-    android:orientation="vertical" >
-    
-    <LinearLayout 
-	    android:layout_width="match_parent"
-	    android:layout_height="wrap_content"
-	    android:orientation="horizontal"
-	    android:background="@drawable/toolsbar_background">
-        
-        <TextView 
-            android:contentDescription="@string/content_description_delete"
-            android:id="@+id/deleteAll"
-            android:background="@drawable/history_delete"
-            android:text="@string/button_delete_all"
-            android:gravity="center"
-            android:paddingTop="20dp"
-            android:textColor="@drawable/text_button"
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent"
-		    android:scaleType="centerCrop"
-		    android:adjustViewBounds="true"
-		    android:layout_weight="1"/>
-        
-        <TextView 
-            android:contentDescription="@string/content_description_all_calls"
-            android:id="@+id/allCalls"
-            android:background="@drawable/history_all"
-            android:text="@string/button_all_call"
-            android:gravity="center"
-            android:paddingTop="15dp"
-            android:textColor="@drawable/text_switch_button_color"
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent"
-		    android:scaleType="centerCrop"
-		    android:adjustViewBounds="true"
-		    android:layout_weight="1"/>
-        
-        <TextView 
-            android:contentDescription="@string/content_description_missed_calls"
-            android:id="@+id/missedCalls"
-            android:background="@drawable/history_missed"
-            android:text="@string/button_missed_call"
-            android:gravity="center"
-            android:paddingTop="15dp"
-            android:textColor="@drawable/text_switch_button_color"
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent"
-		    android:scaleType="centerCrop"
-		    android:adjustViewBounds="true"
-		    android:layout_weight="1"/>
-        
-        <TextView 
-            android:contentDescription="@string/content_description_edit"
-            android:id="@+id/edit"
-            android:background="@drawable/history_edit"
-            android:text="@string/button_edit"
-            android:gravity="center"
-            android:paddingTop="20dp"
-            android:textColor="@drawable/text_button"
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent"
-		    android:scaleType="centerCrop"
-		    android:adjustViewBounds="true"
-		    android:layout_weight="1"/>
-        
-        <TextView 
-            android:contentDescription="@string/content_description_validate"
-            android:id="@+id/ok"
-            android:background="@drawable/history_ok"
-            android:text="@string/button_ok"
-            android:gravity="center"
-            android:paddingTop="20dp"
-            android:textColor="@drawable/text_button"
-            android:visibility="gone"
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent"
-		    android:scaleType="centerCrop"
-		    android:adjustViewBounds="true"
-		    android:layout_weight="1"/>
-        
-    </LinearLayout>
-    
-    <ExpandableListView 
-        android:id="@+id/historyList"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:divider="@android:color/darker_gray"
-        android:cacheColorHint="@color/transparent"
-        android:dividerHeight="1dp" />
-    
-    <TextView 
-        android:id="@+id/noCallHistory"
-        android:visibility="gone"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:text="@string/no_call_history"
-        android:textColor="@drawable/text_color"
-        android:textAppearance="@android:style/TextAppearance.Large"/>
-    
-    <TextView 
-        android:id="@+id/noMissedCallHistory"
-        android:visibility="gone"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:text="@string/no_missed_call_history"
-        android:textColor="@drawable/text_color"
-        android:textAppearance="@android:style/TextAppearance.Large"/>
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@drawable/background"
+	android:orientation="vertical" >
 
-</LinearLayout>
\ No newline at end of file
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:background="@drawable/toolsbar_background">
+
+		<TextView
+			android:contentDescription="@string/content_description_delete"
+			android:id="@+id/deleteAll"
+			android:background="@drawable/history_delete"
+			android:text="@string/button_delete_all"
+			android:gravity="center"
+			android:paddingTop="20dp"
+			android:textColor="@drawable/text_button"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:scaleType="centerCrop"
+			android:adjustViewBounds="true"
+			android:layout_weight="1"/>
+
+		<TextView
+			android:contentDescription="@string/content_description_all_calls"
+			android:id="@+id/allCalls"
+			android:background="@drawable/history_all"
+			android:text="@string/button_all_call"
+			android:gravity="center"
+			android:paddingTop="20dp"
+			android:textColor="@drawable/text_switch_button_color"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:scaleType="centerCrop"
+			android:adjustViewBounds="true"
+			android:layout_weight="1"/>
+
+		<TextView
+			android:contentDescription="@string/content_description_missed_calls"
+			android:id="@+id/missedCalls"
+			android:background="@drawable/history_missed"
+			android:text="@string/button_missed_call"
+			android:gravity="center"
+			android:paddingTop="20dp"
+			android:textColor="@drawable/text_switch_button_color"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:scaleType="centerCrop"
+			android:adjustViewBounds="true"
+			android:layout_weight="1"/>
+
+		<TextView
+			android:contentDescription="@string/content_description_edit"
+			android:id="@+id/edit"
+			android:background="@drawable/history_edit"
+			android:text="@string/button_edit"
+			android:gravity="center"
+			android:paddingTop="20dp"
+			android:textColor="@drawable/text_button"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:scaleType="centerCrop"
+			android:adjustViewBounds="true"
+			android:layout_weight="1"/>
+
+		<TextView
+			android:contentDescription="@string/content_description_validate"
+			android:id="@+id/ok"
+			android:background="@drawable/history_ok"
+			android:text="@string/button_ok"
+			android:gravity="center"
+			android:paddingTop="20dp"
+			android:textColor="@drawable/text_button"
+			android:visibility="gone"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:scaleType="centerCrop"
+			android:adjustViewBounds="true"
+			android:layout_weight="1"/>
+
+	</LinearLayout>
+
+	<ExpandableListView
+		android:id="@+id/historyList"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:divider="@android:color/darker_gray"
+		android:cacheColorHint="@color/transparent"
+		android:dividerHeight="1dp" />
+
+	<TextView
+		android:id="@+id/noCallHistory"
+		android:visibility="gone"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:gravity="center"
+		android:text="@string/no_call_history"
+		android:textColor="@drawable/text_color"
+		android:textAppearance="@android:style/TextAppearance.Large"/>
+
+	<TextView
+		android:id="@+id/noMissedCallHistory"
+		android:visibility="gone"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:gravity="center"
+		android:text="@string/no_missed_call_history"
+		android:textColor="@drawable/text_color"
+		android:textAppearance="@android:style/TextAppearance.Large"/>
+
+</LinearLayout>
diff --git a/res/layout/history_simple.xml b/res/layout/history_simple.xml
index 6d7a969be..821271d67 100644
--- a/res/layout/history_simple.xml
+++ b/res/layout/history_simple.xml
@@ -1,120 +1,120 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-  	android:background="@drawable/background"
-    android:orientation="vertical" >
-    
-    <LinearLayout 
-	    android:layout_width="match_parent"
-	    android:layout_height="wrap_content"
-	    android:orientation="horizontal"
-	    android:background="@drawable/toolsbar_background">
-        
-        <TextView 
-            android:contentDescription="@string/content_description_delete"
-            android:id="@+id/deleteAll"
-            android:background="@drawable/history_delete"
-            android:text="@string/button_delete_all"
-            android:gravity="center"
-            android:paddingTop="20dp"
-            android:textSize="13dp"
-            android:textColor="@drawable/text_button"
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent"
-		    android:scaleType="centerCrop"
-		    android:adjustViewBounds="true"
-		    android:layout_weight="1"/>
-        
-        <TextView 
-            android:contentDescription="@string/content_description_all_calls"
-            android:id="@+id/allCalls"
-            android:background="@drawable/history_all"
-            android:text="@string/button_all_call"
-            android:gravity="center"
-            android:paddingTop="15dp"
-            android:textSize="13dp"
-            android:textColor="@drawable/text_switch_button_color"
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent"
-		    android:scaleType="centerCrop"
-		    android:adjustViewBounds="true"
-		    android:layout_weight="1"/>
-        
-        <TextView 
-            android:contentDescription="@string/content_description_missed_calls"
-            android:id="@+id/missedCalls"
-            android:background="@drawable/history_missed"
-            android:text="@string/button_missed_call"
-            android:gravity="center"
-            android:paddingTop="15dp"
-            android:textSize="13dp"
-            android:textColor="@drawable/text_switch_button_color"
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent"
-		    android:scaleType="centerCrop"
-		    android:adjustViewBounds="true"
-		    android:layout_weight="1"/>
-        
-        <TextView 
-            android:contentDescription="@string/content_description_edit"
-            android:id="@+id/edit"
-            android:background="@drawable/history_edit"
-            android:text="@string/button_edit"
-            android:gravity="center"
-            android:paddingTop="20dp"
-            android:textSize="13dp"
-            android:textColor="@drawable/text_button"
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent"
-		    android:scaleType="centerCrop"
-		    android:adjustViewBounds="true"
-		    android:layout_weight="1"/>
-        
-        <TextView 
-            android:contentDescription="@string/content_description_validate"
-            android:id="@+id/ok"
-            android:background="@drawable/history_ok"
-            android:text="@string/button_ok"
-            android:gravity="center"
-            android:paddingTop="20dp"
-            android:textSize="13dp"
-            android:textColor="@drawable/text_button"
-            android:visibility="gone"
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent"
-		    android:scaleType="centerCrop"
-		    android:adjustViewBounds="true"
-		    android:layout_weight="1"/>
-        
-    </LinearLayout>
-    
-    <ListView 
-        android:id="@+id/historyList"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:divider="@android:color/darker_gray"
-        android:cacheColorHint="@color/transparent"
-        android:dividerHeight="1dp" />
-    
-    <TextView 
-        android:id="@+id/noCallHistory"
-        android:visibility="gone"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:text="@string/no_call_history"
-        android:textColor="@drawable/text_color"
-        android:textAppearance="@android:style/TextAppearance.Large"/>
-    
-    <TextView 
-        android:id="@+id/noMissedCallHistory"
-        android:visibility="gone"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:text="@string/no_missed_call_history"
-        android:textColor="@drawable/text_color"
-        android:textAppearance="@android:style/TextAppearance.Large"/>
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@drawable/background"
+	android:orientation="vertical" >
 
-</LinearLayout>
\ No newline at end of file
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:background="@drawable/toolsbar_background">
+
+		<TextView
+			android:contentDescription="@string/content_description_delete"
+			android:id="@+id/deleteAll"
+			android:background="@drawable/history_delete"
+			android:text="@string/button_delete_all"
+			android:gravity="center"
+			android:paddingTop="20dp"
+			android:textSize="13dp"
+			android:textColor="@drawable/text_button"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:scaleType="centerCrop"
+			android:adjustViewBounds="true"
+			android:layout_weight="1"/>
+
+		<TextView
+			android:contentDescription="@string/content_description_all_calls"
+			android:id="@+id/allCalls"
+			android:background="@drawable/history_all"
+			android:text="@string/button_all_call"
+			android:gravity="center"
+			android:paddingTop="20dp"
+			android:textSize="13dp"
+			android:textColor="@drawable/text_switch_button_color"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:scaleType="centerCrop"
+			android:adjustViewBounds="true"
+			android:layout_weight="1"/>
+
+		<TextView
+			android:contentDescription="@string/content_description_missed_calls"
+			android:id="@+id/missedCalls"
+			android:background="@drawable/history_missed"
+			android:text="@string/button_missed_call"
+			android:gravity="center"
+			android:paddingTop="20dp"
+			android:textSize="13dp"
+			android:textColor="@drawable/text_switch_button_color"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:scaleType="centerCrop"
+			android:adjustViewBounds="true"
+			android:layout_weight="1"/>
+
+		<TextView
+			android:contentDescription="@string/content_description_edit"
+			android:id="@+id/edit"
+			android:background="@drawable/history_edit"
+			android:text="@string/button_edit"
+			android:gravity="center"
+			android:paddingTop="20dp"
+			android:textSize="13dp"
+			android:textColor="@drawable/text_button"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:scaleType="centerCrop"
+			android:adjustViewBounds="true"
+			android:layout_weight="1"/>
+
+		<TextView
+			android:contentDescription="@string/content_description_validate"
+			android:id="@+id/ok"
+			android:background="@drawable/history_ok"
+			android:text="@string/button_ok"
+			android:gravity="center"
+			android:paddingTop="20dp"
+			android:textSize="13dp"
+			android:textColor="@drawable/text_button"
+			android:visibility="gone"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:scaleType="centerCrop"
+			android:adjustViewBounds="true"
+			android:layout_weight="1"/>
+
+	</LinearLayout>
+
+	<ListView
+		android:id="@+id/historyList"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:divider="@android:color/darker_gray"
+		android:cacheColorHint="@color/transparent"
+		android:dividerHeight="1dp" />
+
+	<TextView
+		android:id="@+id/noCallHistory"
+		android:visibility="gone"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:gravity="center"
+		android:text="@string/no_call_history"
+		android:textColor="@drawable/text_color"
+		android:textAppearance="@android:style/TextAppearance.Large"/>
+
+	<TextView
+		android:id="@+id/noMissedCallHistory"
+		android:visibility="gone"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:gravity="center"
+		android:text="@string/no_missed_call_history"
+		android:textColor="@drawable/text_color"
+		android:textAppearance="@android:style/TextAppearance.Large"/>
+
+</LinearLayout>

From 2597bc12a9006b29b9e97a350b8f1e2b1d321b68 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Fri, 1 Aug 2014 13:37:53 +0200
Subject: [PATCH 2/2] Android NDK r10 is not yet supported for X86 platform
 (crash on launch)

---
 README | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/README b/README
index ddf510a2f..53354ee1f 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@
 
 To build liblinphone for Android, you must:
 0) download the Android sdk with platform-tools and tools updated to latest revision (at least API 16 is needed), then add both 'tools' and 'platform-tools' folders in your path.
-1) download the Android ndk (>=r9d) from google and add it to your path (no symlink !!!).
+1) download the Android ndk (>=r9d, < r10) from google and add it to your path (no symlink !!!).
 2) install yasm, nasm, curl, ant, rsync and the autotools: autoconf, automake, aclocal, libtoolize, pkgconfig
 	On 64 bits linux systems you'll need the ia32-libs package
 	With the latest Debian (multiarch), you need this:
@@ -21,7 +21,7 @@ To build liblinphone for Android, you must:
 7) (Optional) To generate a signed apk to publish on the Google Play, run
 	$ make release
 It will ask you for the version number that will be displayed in the about page of the app.
-Make sure you filled the ant.properties values for key.store and key.alias in order to correctly 
+Make sure you filled the ant.properties values for key.store and key.alias in order to correctly
 sign the generated apk (it will ask you the password during the process)
 
 To run the tutorials:
@@ -39,6 +39,8 @@ To create an apk with a different package name, you need to edit the custom_rule
 			   TROUBLESHOOTING
 			*****************************
 
+Currently Android NDK 10 is NOT supported for X86 version, please use Android NDK 9d maximum.
+
 If you encounter troubles with the make clean target and you are using the 8e android ndk, the solution can be found here: https://groups.google.com/forum/?fromgroups=#!topic/android-ndk/3wIbb-h3nDU
 
 If you built the app using eclipse, ensure you ran at least once the make command (see above steps 0 to 3) ! Else you'll have this exceptions:
@@ -63,7 +65,7 @@ BUILD_VIDEO
 BUILD_X264
 	values: 0 (don't build x264) or 1 (build x264), default value: 1
 
-BUILD_AMRNB          
+BUILD_AMRNB
 	values: 0 (don't build amrnb codec), light (try to use amrnb codec from android), full (build your own amrnb codec), default value: full
 
 BUILD_AMRWB
@@ -72,7 +74,7 @@ BUILD_AMRWB
 BUILD_ZRTP
 	values: 0 (don't support ZRTP), 1 (support ZRTP), default value: 1
 
-BUILD_SILK            
+BUILD_SILK
 	values: 0 (don't build silk plugin), 1 (build silk) [silk is Skype nonfree patented audio codec], default value: 1
 
 BUILD_G729