* Changed process of call creation
* Modified Fly-in menu layout
* Added SearchView in ContactList handle
diff --git a/res/layout/activity_call_layout.xml b/res/layout/activity_call_layout.xml
index e585001..764b9e7 100644
--- a/res/layout/activity_call_layout.xml
+++ b/res/layout/activity_call_layout.xml
@@ -37,36 +37,9 @@
android:gravity="center_horizontal"
android:orientation="vertical" >
- <!--
- <Button
- android:id="@+id/buttonanswer"
+ <android.support.v4.view.ViewPager
+ android:id="@+id/pager"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="Answer Up" />
-
- <Button
- android:id="@+id/buttonhangup"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="Hang Up" />
-
- <Button
- android:id="@+id/buttonhold"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="Hold" />
-
- <Button
- android:id="@+id/buttonunhold"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="Unhold" /> -->
-
- <LinearLayout
- android:id="@+id/fragment_layout"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
- </LinearLayout>
+ android:layout_height="match_parent" />
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/activity_sflphone_home.xml b/res/layout/activity_sflphone_home.xml
index 438da83..6774d3a 100644
--- a/res/layout/activity_sflphone_home.xml
+++ b/res/layout/activity_sflphone_home.xml
@@ -82,36 +82,38 @@
android:background="@color/light"
android:scaleType="fitCenter" />
- <TextView
- android:id="@+id/handle_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_below="@+id/menu_top_shadow"
- android:layout_centerInParent="true"
- android:layout_toLeftOf="@+id/contact_search"
- android:layout_toRightOf="@+id/handle_cover"
- android:background="@color/light"
- android:gravity="center"
- android:singleLine="true"
- android:text="Contacts"
- android:textStyle="bold" />
- <ImageButton
- android:id="@+id/contact_search"
- android:layout_width="50dp"
- android:layout_height="50dp"
- android:layout_alignParentBottom="true"
- android:layout_alignParentRight="true"
- android:layout_below="@+id/menu_top_shadow"
- android:layout_centerInParent="true"
- android:background="@color/light"
- android:src="@drawable/ic_menu_search"
- android:drawSelectorOnTop="true"
- android:clickable="true"
- android:focusable="true"
- android:padding="5dp"
- android:scaleType="centerInside" />
+
+ <TextView
+ android:id="@+id/handle_title"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentBottom="true"
+ android:layout_below="@+id/menu_top_shadow"
+ android:layout_centerInParent="true"
+ android:layout_toLeftOf="@+id/contact_search_text"
+ android:layout_toRightOf="@+id/handle_cover"
+ android:background="@color/light"
+ android:gravity="center"
+ android:singleLine="true"
+ android:text="Contacts"
+ android:textStyle="bold" />
+
+ <SearchView
+ android:id="@+id/contact_search_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:clickable="true"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentRight="true"
+ android:layout_below="@+id/menu_top_shadow"
+ android:gravity="center"
+ android:background="@color/light" >
+ </SearchView>
+
+
</RelativeLayout>
<FrameLayout
diff --git a/res/layout/frag_call.xml b/res/layout/frag_call.xml
new file mode 100644
index 0000000..ff158fe
--- /dev/null
+++ b/res/layout/frag_call.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent" >
+
+ <com.savoirfairelinux.sflphone.model.BubblesView
+ android:id="@+id/main_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentTop="true"
+ android:focusable="true" />
+
+ <!-- <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:orientation="horizontal"
+ android:weightSum="2" >
+
+ <Button
+ android:id="@+id/add_bubble"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="Add Bubble" />
+
+ <Button
+ android:id="@+id/remove_bubble"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="Remove Bubble" />
+ </LinearLayout> -->
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/frag_call_element.xml b/res/layout/frag_call_element.xml
index 180b2ce..4dd9d6f 100644
--- a/res/layout/frag_call_element.xml
+++ b/res/layout/frag_call_element.xml
@@ -37,8 +37,6 @@
android:paddingLeft="8dp"
android:paddingRight="8dp" >
-
-
<ListView
android:id="@id/android:list"
style="@style/CallElementList"
@@ -46,6 +44,8 @@
android:layout_height="match_parent"
android:drawSelectorOnTop="false" />
+
+
<TextView
android:id="@id/android:empty"
android:layout_width="match_parent"
@@ -54,32 +54,31 @@
android:gravity="center"
android:text="No data" />
+ <!-- <Button -->
+ <!-- android:id="@+id/button_attended" -->
+ <!-- android:layout_width="wrap_content" -->
+ <!-- android:layout_height="wrap_content" -->
+ <!-- android:layout_above="@+id/phoneNumberTextEntry" -->
+ <!-- android:layout_alignParentLeft="true" -->
+ <!-- android:text="Attended transfer" /> -->
+ <!-- <Button -->
+ <!-- android:id="@+id/button_conf" -->
+ <!-- android:layout_width="wrap_content" -->
+ <!-- android:layout_height="wrap_content" -->
+ <!-- android:layout_above="@+id/phoneNumberTextEntry" -->
+ <!-- android:layout_alignParentRight="true" -->
+ <!-- android:text="Conference" /> -->
-<!-- <Button -->
-<!-- android:id="@+id/button_attended" -->
-<!-- android:layout_width="wrap_content" -->
-<!-- android:layout_height="wrap_content" -->
-<!-- android:layout_above="@+id/phoneNumberTextEntry" -->
-<!-- android:layout_alignParentLeft="true" -->
-<!-- android:text="Attended transfer" /> -->
-<!-- <Button -->
-<!-- android:id="@+id/button_conf" -->
-<!-- android:layout_width="wrap_content" -->
-<!-- android:layout_height="wrap_content" -->
-<!-- android:layout_above="@+id/phoneNumberTextEntry" -->
-<!-- android:layout_alignParentRight="true" -->
-<!-- android:text="Conference" /> -->
-
-<!-- <ToggleButton -->
-<!-- android:id="@+id/switch_hold" -->
-<!-- android:layout_width="wrap_content" -->
-<!-- android:layout_height="wrap_content" -->
-<!-- android:layout_alignParentRight="true" -->
-<!-- android:layout_above="@+id/button_conf" -->
-<!-- android:textOn="Unhold" -->
-<!-- android:textOff="Hold" /> -->
+ <!-- <ToggleButton -->
+ <!-- android:id="@+id/switch_hold" -->
+ <!-- android:layout_width="wrap_content" -->
+ <!-- android:layout_height="wrap_content" -->
+ <!-- android:layout_alignParentRight="true" -->
+ <!-- android:layout_above="@+id/button_conf" -->
+ <!-- android:textOn="Unhold" -->
+ <!-- android:textOff="Hold" /> -->
</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/frag_contact_list_header.xml b/res/layout/frag_contact_list_header.xml
index f5f71d6..f1dbe5e 100644
--- a/res/layout/frag_contact_list_header.xml
+++ b/res/layout/frag_contact_list_header.xml
@@ -13,4 +13,5 @@
android:numColumns="auto_fit"
android:stretchMode="spacingWidth" />
+
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/item_menu.xml b/res/layout/item_menu.xml
index ad7face..21da43c 100644
--- a/res/layout/item_menu.xml
+++ b/res/layout/item_menu.xml
@@ -1,16 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/menu_title_categorie"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <TextView
- android:id="@+id/menu_title_categorie"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:layout_margin="10dp"
- android:text="Medium Text"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
-</LinearLayout>
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:paddingBottom="10dip"
+ android:paddingLeft="15dip"
+ android:paddingTop="10dip"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
diff --git a/res/layout/item_menu_header.xml b/res/layout/item_menu_header.xml
new file mode 100644
index 0000000..c596b3a
--- /dev/null
+++ b/res/layout/item_menu_header.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/list_header_title"
+ style="?android:attr/listSeparatorTextViewStyle"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingBottom="2dip"
+ android:paddingLeft="5dip"
+ android:paddingTop="2dip" />