* #31230: changed search view
diff --git a/res/drawable/item_generic_selector.xml b/res/drawable/item_generic_selector.xml
new file mode 100644
index 0000000..9a557e3
--- /dev/null
+++ b/res/drawable/item_generic_selector.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_pressed="true"><shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <solid android:color="@color/darker_gray" />
+
+ <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
+
+ <corners android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" android:topLeftRadius="5dp" android:topRightRadius="5dp" />
+ </shape></item>
+ <item android:state_focused="true"><shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <solid android:color="@color/light" />
+
+ <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
+
+ <corners android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" android:topLeftRadius="5dp" android:topRightRadius="5dp" />
+ </shape></item>
+ <item><shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <solid android:color="@color/light" />
+
+ <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
+
+ <corners android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" android:topLeftRadius="5dp" android:topRightRadius="5dp" />
+ </shape></item>
+
+</selector>
diff --git a/res/drawable/item_history_selector.xml b/res/drawable/item_history_selector.xml
index 4cd74a0..5ffd3ed 100644
--- a/res/drawable/item_history_selector.xml
+++ b/res/drawable/item_history_selector.xml
@@ -2,21 +2,21 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"><shape xmlns:android="http://schemas.android.com/apk/res/android">
- <solid android:color="@color/darker_gray" />
+ <solid android:color="@color/sfl_dark_blue" />
<padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
<corners android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" android:topLeftRadius="5dp" android:topRightRadius="5dp" />
</shape></item>
<item android:state_focused="true"><shape xmlns:android="http://schemas.android.com/apk/res/android">
- <solid android:color="@color/darker_gray" />
+ <solid android:color="@color/sfl_dark_blue" />
<padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
<corners android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" android:topLeftRadius="5dp" android:topRightRadius="5dp" />
</shape></item>
<item><shape xmlns:android="http://schemas.android.com/apk/res/android">
- <solid android:color="@color/light" />
+ <solid android:color="@color/sfl_dark_blue" />
<padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
diff --git a/res/layout/frag_contact_list.xml b/res/layout/frag_contact_list.xml
index d6eb7ab..9cd89c9 100644
--- a/res/layout/frag_contact_list.xml
+++ b/res/layout/frag_contact_list.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2013 Savoir-Faire Linux Inc.
-Author: Adrien Beraud <adrien.beraud@gmail.com>
+Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+ 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
@@ -37,6 +38,7 @@
android:focusableInTouchMode="false"
android:orientation="vertical" >
+
<ListView
android:id="@+id/contacts_list"
style="@style/CallElementList"
diff --git a/res/layout/frag_contact_list_header.xml b/res/layout/frag_contact_list_header.xml
index 60b31c0..cb52add 100644
--- a/res/layout/frag_contact_list_header.xml
+++ b/res/layout/frag_contact_list_header.xml
@@ -5,6 +5,12 @@
android:layout_height="wrap_content"
android:background="@color/sfl_light_blue"
android:orientation="vertical" >
+
+ <SearchView
+ android:id="@+id/contact_search"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/lighter_gray" />
<TextView
android:layout_width="match_parent"
diff --git a/res/layout/frag_dialing.xml b/res/layout/frag_dialing.xml
index 3eb9249..d175623 100644
--- a/res/layout/frag_dialing.xml
+++ b/res/layout/frag_dialing.xml
@@ -29,7 +29,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
- android:background="@drawable/item_history_selector"
+ android:background="@drawable/item_generic_selector"
android:contentDescription="@string/dial_numeric_pad"
android:layout_marginRight="5dp"
android:src="@drawable/ic_action_dial_pad" />
@@ -40,7 +40,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginLeft="5dp"
- android:background="@drawable/item_history_selector"
+ android:background="@drawable/item_generic_selector"
android:contentDescription="@string/dial_alphabetic_pad"
android:src="@drawable/ic_action_keyboard" />
</LinearLayout>
diff --git a/res/layout/frag_home.xml b/res/layout/frag_home.xml
index f17dbcc..2b7660c 100644
--- a/res/layout/frag_home.xml
+++ b/res/layout/frag_home.xml
@@ -35,14 +35,13 @@
android:layout_height="match_parent"
android:background="@color/lighter_gray" >
-
<RelativeLayout
android:id="@+id/calls_layouts"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_margin="10dp"
- android:background="@drawable/item_history_selector" >
+ android:background="@drawable/item_generic_selector" >
<LinearLayout
android:id="@+id/linear1"
@@ -83,7 +82,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/calls_layouts"
android:layout_margin="10dp"
- android:background="@drawable/item_history_selector" >
+ android:background="@drawable/item_generic_selector" >
<LinearLayout
android:id="@+id/linear2"
diff --git a/res/layout/item_contact_starred.xml b/res/layout/item_contact_starred.xml
index 6040bc0..e57ba39 100644
--- a/res/layout/item_contact_starred.xml
+++ b/res/layout/item_contact_starred.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/contactview"
- android:padding="5dp"
android:layout_width="match_parent"
android:layout_height="match_parent" >
diff --git a/res/layout/item_history.xml b/res/layout/item_history.xml
index 2d7fc9b..0241fb8 100644
--- a/res/layout/item_history.xml
+++ b/res/layout/item_history.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (C) 2004-2012 Savoir-Faire Linux Inc.
+Copyright (C) 2004-2013 Savoir-Faire Linux Inc.
-Author: Adrien Beraud <adrien.beraud@gmail.com>
+Author: Alexandre Lision <alexandre.lision@savoirfairelinux.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
@@ -52,7 +52,7 @@
android:layout_toRightOf="@+id/photo"
android:paddingLeft="@dimen/padding_small"
android:singleLine="true"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceMediumInverse" />
<TextView
android:id="@+id/duration"
@@ -61,7 +61,7 @@
android:layout_below="@+id/display_name"
android:layout_toRightOf="@+id/photo"
android:paddingLeft="@dimen/padding_small"
- android:textAppearance="?android:attr/textAppearanceSmall" />
+ android:textAppearance="?android:attr/textAppearanceSmallInverse" />
<TextView
android:id="@+id/date_start"
@@ -70,7 +70,7 @@
android:layout_below="@+id/display_name"
android:layout_toRightOf="@+id/duration"
android:paddingLeft="@dimen/padding_small"
- android:textAppearance="?android:attr/textAppearanceSmall" />
+ android:textAppearance="?android:attr/textAppearanceSmallInverse" />
<TextView
android:id="@+id/incomings"
@@ -79,7 +79,7 @@
android:layout_alignLeft="@+id/duration"
android:layout_below="@+id/duration"
android:paddingLeft="@dimen/padding_small"
- android:textAppearance="?android:attr/textAppearanceSmall" />
+ android:textAppearance="?android:attr/textAppearanceSmallInverse" />
<TextView
android:id="@+id/outgoings"
@@ -88,7 +88,7 @@
android:layout_alignLeft="@+id/duration"
android:layout_below="@+id/incomings"
android:paddingLeft="@dimen/padding_small"
- android:textAppearance="?android:attr/textAppearanceSmall" />
+ android:textAppearance="?android:attr/textAppearanceSmallInverse" />
<TextView
android:id="@+id/missed"
@@ -97,7 +97,7 @@
android:layout_alignLeft="@+id/duration"
android:layout_below="@+id/outgoings"
android:paddingLeft="@dimen/padding_small"
- android:textAppearance="?android:attr/textAppearanceSmall" />
+ android:textAppearance="?android:attr/textAppearanceSmallInverse" />
<Button
android:id="@+id/replay"
@@ -108,7 +108,7 @@
android:layout_toRightOf="@+id/outgoings"
android:paddingLeft="@dimen/padding_small"
android:text="@string/hist_replay_button"
- android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textAppearance="?android:attr/textAppearanceSmallInverse"
android:visibility="gone" />
<ImageButton
@@ -118,6 +118,6 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/call_button"
- android:src="@drawable/ic_call" />
+ android:src="@drawable/ic_action_call" />
</RelativeLayout>
\ No newline at end of file