* #26787 Replaced buttons by DnD
diff --git a/res/layout/frag_call_list.xml b/res/layout/frag_call_list.xml
index fc7ea626..d4d2726 100644
--- a/res/layout/frag_call_list.xml
+++ b/res/layout/frag_call_list.xml
@@ -5,10 +5,12 @@
android:background="@color/lighter_gray"
android:orientation="vertical" >
- <ExpandableListView
+ <ListView
android:id="@+id/call_list"
android:layout_width="match_parent"
- android:layout_height="wrap_content" >
- </ExpandableListView>
+ android:layout_height="wrap_content"
+ android:choiceMode="singleChoice"
+ android:clickable="true" >
+ </ListView>
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/frag_dialing.xml b/res/layout/frag_dialing.xml
index f8e2332..9bda408 100644
--- a/res/layout/frag_dialing.xml
+++ b/res/layout/frag_dialing.xml
@@ -49,7 +49,6 @@
android:layout_centerHorizontal="true"
android:layout_margin="10dp"
android:adjustViewBounds="true"
-
android:background="@drawable/call_button"
android:gravity="center_vertical"
android:src="@drawable/ic_call" />
diff --git a/res/layout/frag_home.xml b/res/layout/frag_home.xml
new file mode 100644
index 0000000..73c389f
--- /dev/null
+++ b/res/layout/frag_home.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
+
+Author: Adrien Beraud <adrien.beraud@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Additional permission under GNU GPL version 3 section 7:
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingLeft="8dp"
+ android:background="@color/lighter_gray"
+ android:paddingRight="8dp" >
+
+
+ <Button
+ android:id="@+id/access_callactivity"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:text="Current Calls" />
+
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/item_calllist.xml b/res/layout/item_calllist.xml
index 07c8082..0b53f0a 100644
--- a/res/layout/item_calllist.xml
+++ b/res/layout/item_calllist.xml
@@ -9,8 +9,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
- android:layout_toLeftOf="@+id/expand_button"
- android:clickable="true" >
+ android:layout_centerVertical="true"
+ android:layout_toLeftOf="@+id/num_participants" >
<TextView
android:id="@+id/call_title"
@@ -18,6 +18,10 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
+ android:ellipsize="marquee"
+ android:marqueeRepeatLimit="marquee_forever"
+ android:scrollHorizontally="true"
+ android:singleLine="true"
android:text="call_title"
android:textSize="20sp" />
@@ -34,22 +38,32 @@
android:id="@+id/call_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_toRightOf="@+id/call_status"
android:layout_below="@+id/call_title"
+ android:layout_toRightOf="@+id/call_status"
android:paddingLeft="10dp"
android:text="call_time"
android:textSize="12sp" />
</RelativeLayout>
- <ImageButton
- android:id="@+id/expand_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ <TextView
+ android:id="@+id/num_participants"
+ android:layout_width="100dp"
+ android:layout_height="100dp"
android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:background="@null"
- android:focusable="false"
- android:focusableInTouchMode="false"
- android:src="@drawable/up_arrow" />
+ android:layout_centerHorizontal="true"
+ android:background="@drawable/call_button"
+ android:gravity="center"
+ android:text="0"
+ android:textSize="30sp" />
+
+ <!-- <ImageButton -->
+ <!-- android:id="@+id/expand_button" -->
+ <!-- android:layout_width="wrap_content" -->
+ <!-- android:layout_height="wrap_content" -->
+ <!-- android:layout_alignParentRight="true" -->
+ <!-- android:layout_centerVertical="true" -->
+ <!-- android:background="@null" -->
+ <!-- android:focusable="false" -->
+ <!-- android:src="@drawable/up_arrow" /> -->
</RelativeLayout>
\ No newline at end of file