* #24938 Modified interface to integrate DialingFragment
* #24839 Added serachview icon on ContactsDrawer
Added getCallList method in JNI for future dev
diff --git a/res/layout/activity_sflphone_home.xml b/res/layout/activity_sflphone_home.xml
index 9c0ce72..438da83 100644
--- a/res/layout/activity_sflphone_home.xml
+++ b/res/layout/activity_sflphone_home.xml
@@ -30,88 +30,106 @@
as that of the covered work.
-->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res/com.savoirfairelinux.sflphone"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/drawer_layout"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
+ android:layout_height="match_parent" >
- <android.support.v4.view.ViewPager
- android:id="@+id/pager"
+ <RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res/com.savoirfairelinux.sflphone"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
- <com.savoirfairelinux.sflphone.views.CustomSlidingDrawer
- android:id="@+id/custom_sliding_drawer"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:orientation="vertical"
- app:content="@+id/contacts_frame"
- app:handle="@+id/slider_button" >
-
- <RelativeLayout
- android:id="@+id/slider_button"
+ <android.support.v4.view.ViewPager
+ android:id="@+id/pager"
android:layout_width="match_parent"
- android:layout_height="54dp"
-
- android:maxHeight="40dp" >
+ android:layout_height="match_parent" />
- <ImageView
- android:id="@+id/menu_top_shadow"
+ <com.savoirfairelinux.sflphone.views.CustomSlidingDrawer
+ android:id="@+id/custom_sliding_drawer"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:orientation="vertical"
+ app:content="@+id/contacts_frame"
+ app:handle="@+id/slider_button" >
+
+ <RelativeLayout
+ android:id="@+id/slider_button"
android:layout_width="match_parent"
- android:layout_height="4dp"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:src="@drawable/defaultshadowtop" />
+ android:layout_height="54dp"
+ android:maxHeight="40dp" >
- <ImageView
- android:id="@+id/handle_cover"
- android:layout_width="50dp"
- android:layout_height="50dp"
- android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true"
- android:layout_below="@+id/menu_top_shadow"
- android:background="@color/light"
- android:layout_centerVertical="true"
- android:scaleType="fitCenter" />
+ <ImageView
+ android:id="@+id/menu_top_shadow"
+ android:layout_width="match_parent"
+ android:layout_height="4dp"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentTop="true"
+ android:src="@drawable/defaultshadowtop" />
- <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/btnPlay"
- android:layout_toRightOf="@+id/handle_cover"
- android:background="@color/light"
- android:gravity="center"
- android:singleLine="true"
- android:text="Contacts"
- android:textStyle="bold" />
+ <ImageView
+ android:id="@+id/handle_cover"
+ android:layout_width="50dp"
+ android:layout_height="50dp"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:layout_below="@+id/menu_top_shadow"
+ android:layout_centerVertical="true"
+ android:background="@color/light"
+ android:scaleType="fitCenter" />
- <ImageButton
- android:id="@+id/btnPlay"
- 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:clickable="true"
- android:focusable="true"
- android:padding="5dp"
- android:scaleType="centerInside" />
- </RelativeLayout>
+ <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" />
- <FrameLayout
- android:id="@+id/contacts_frame"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="#FFFFFF" />
- </com.savoirfairelinux.sflphone.views.CustomSlidingDrawer>
+ <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" />
+ </RelativeLayout>
-</RelativeLayout>
\ No newline at end of file
+ <FrameLayout
+ android:id="@+id/contacts_frame"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="#FFFFFF" />
+ </com.savoirfairelinux.sflphone.views.CustomSlidingDrawer>
+ </RelativeLayout>
+
+ <FrameLayout
+ android:id="@+id/left_drawer"
+ android:layout_width="240dp"
+ android:layout_height="match_parent"
+ android:layout_gravity="start"
+ android:background="@color/darker_gray"
+ android:choiceMode="singleChoice"
+ android:divider="@android:color/transparent"
+ android:dividerHeight="0dp" />
+
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file