* #24533 New Contact List, with data model
* #23415 general refactoring
diff --git a/res/layout/item_contact.xml b/res/layout/item_contact.xml
index 423ab66..91e565e 100644
--- a/res/layout/item_contact.xml
+++ b/res/layout/item_contact.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--
+<!--
Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
Author: Adrien Beraud <adrien.beraud@gmail.com>
@@ -29,73 +29,58 @@
shall include the source code for the parts of OpenSSL used as well
as that of the covered work.
-->
-<com.savoirfairelinux.sflphone.client.CallElementView xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/panel"
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/contactview"
+ android:background="@drawable/box_border"
android:layout_width="match_parent"
android:layout_height="match_parent" >
- <!-- android:minHeight="70dp" > -->
- <RelativeLayout
- android:id="@+id/contactview"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@drawable/box_border">
- <ImageButton
- android:id="@+id/toggleButton1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true"
- android:background="#00000000"
- android:drawableLeft="@drawable/call_pause"
- android:gravity="left|center_vertical"
- android:src="@drawable/call_pause"
- android:visibility="gone" />
- <ImageView
- android:id="@+id/photo"
- android:layout_width="70dp"
- android:layout_height="70dp"
- android:scaleType="centerCrop"
- android:src="@drawable/box_border" />
- <TextView
- android:id="@+id/display_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_toRightOf="@+id/photo"
-
- android:paddingLeft="@dimen/padding_small"
- android:paddingTop="@dimen/padding_small"
- android:textAppearance="?android:attr/textAppearanceMedium" />
- <TextView
- android:id="@+id/phones"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/display_name"
- android:layout_toRightOf="@+id/photo"
- android:paddingBottom="@dimen/padding_small"
- android:paddingLeft="@dimen/padding_small"
- android:text="Small Text"
- android:textAppearance="?android:attr/textAppearanceSmall" />
- <TextView
- android:id="@+id/callstate"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/display_name"
- android:layout_toRightOf="@+id/phones"
- android:paddingBottom="@dimen/padding_small"
- android:paddingLeft="@dimen/padding_small"
- android:text="Small Text"
- android:textAppearance="?android:attr/textAppearanceSmall" />
- <!--
- <ImageButton
- android:id="@+id/imageButton1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:background="#00000000"
- android:src="@android:drawable/sym_action_call" />
- -->
- </RelativeLayout>
-</com.savoirfairelinux.sflphone.client.CallElementView>
+ <ImageView
+ android:id="@+id/photo"
+ android:layout_width="70dp"
+ android:layout_height="70dp"
+ android:scaleType="centerCrop" />
+
+ <TextView
+ android:id="@+id/display_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_toRightOf="@+id/photo"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <TextView
+ android:id="@+id/phones"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/display_name"
+ android:layout_toRightOf="@+id/photo"
+ android:text="Small Text"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
+
+ <TextView
+ android:id="@+id/callstate"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/display_name"
+ android:layout_toRightOf="@+id/phones"
+ android:paddingBottom="@dimen/padding_small"
+ android:paddingLeft="@dimen/padding_small"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
+
+<!-- <ImageButton -->
+<!-- android:id="@+id/toggleButton1" -->
+<!-- android:layout_width="wrap_content" -->
+<!-- android:layout_height="wrap_content" -->
+<!-- android:layout_alignParentRight="true" -->
+<!-- android:layout_centerVertical="true" -->
+<!-- android:background="#CCCCCC" -->
+<!-- android:clickable="false" -->
+<!-- android:drawableLeft="@drawable/call_pause" -->
+<!-- android:focusable="false" -->
+<!-- android:gravity="left|center_vertical" -->
+<!-- android:src="@drawable/call_pause" /> -->
+ -->
+
+</RelativeLayout>
\ No newline at end of file