* #31377: functionnal actions
diff --git a/res/drawable-hdpi/ic_call.png b/res/drawable-hdpi/ic_call.png
deleted file mode 100644
index 2643786..0000000
--- a/res/drawable-hdpi/ic_call.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_hangup.png b/res/drawable-hdpi/ic_hangup.png
deleted file mode 100644
index 38cd2a1..0000000
--- a/res/drawable-hdpi/ic_hangup.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_call.png b/res/drawable-mdpi/ic_call.png
deleted file mode 100644
index 07223ac..0000000
--- a/res/drawable-mdpi/ic_call.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_hangup.png b/res/drawable-mdpi/ic_hangup.png
deleted file mode 100644
index dbc41ca..0000000
--- a/res/drawable-mdpi/ic_hangup.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_call.png b/res/drawable-xhdpi/ic_call.png
deleted file mode 100644
index 9036df9..0000000
--- a/res/drawable-xhdpi/ic_call.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_hangup.png b/res/drawable-xhdpi/ic_hangup.png
deleted file mode 100644
index 8abe1c4..0000000
--- a/res/drawable-xhdpi/ic_hangup.png
+++ /dev/null
Binary files differ
diff --git a/res/layout/expandable_child.xml b/res/layout/expandable_child.xml
deleted file mode 100644
index 9f85a59..0000000
--- a/res/layout/expandable_child.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="50dp"
- android:weightSum="4" >
-
- <Button
- android:id="@+id/action_hold"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:tag="hold"
- android:textSize="12sp"
- android:text="@string/action_call_hold" />
-
- <Button
- android:id="@+id/action_conf"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:textSize="12sp"
- android:text="@string/action_call_conference" />
-
- <Button
- android:id="@+id/action_transfer"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:textSize="12sp"
- android:text="@string/action_call_general_transfer" />
-
- <ImageButton
- android:id="@+id/action_hangup"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:textSize="12sp"
- android:src="@drawable/ic_hangup" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/frag_call.xml b/res/layout/frag_call.xml
index c321d3f..c5f5d7e 100644
--- a/res/layout/frag_call.xml
+++ b/res/layout/frag_call.xml
@@ -1,15 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/sfl_light_blue"
+ android:divider="@drawable/divider"
android:orientation="vertical"
- android:paddingTop="?android:attr/actionBarSize" >
+ android:paddingTop="?android:attr/actionBarSize"
+ android:showDividers="middle" >
<RelativeLayout
style="?android:attr/actionBarSplitStyle"
android:layout_width="match_parent"
- android:layout_height="?android:attr/actionBarSize"
- android:background="@color/transparent_light" >
+ android:background="@null"
+ android:layout_height="?android:attr/actionBarSize" >
<ImageView
android:id="@+id/button1"
@@ -19,7 +22,7 @@
android:layout_gravity="left"
android:layout_marginLeft="15dp"
android:layout_marginRight="10dp"
- android:src="@drawable/device_access_call" />
+ android:src="@drawable/ic_action_call" />
<TextView
android:id="@+id/call_status_txt"
@@ -28,7 +31,7 @@
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/button1"
android:textAppearance="?android:attr/textAppearanceLarge"
- android:textColor="#333333" />
+ android:textColor="@color/white" />
<ImageButton
android:id="@+id/dialpad_btn"
diff --git a/res/layout/frag_contact_list_header.xml b/res/layout/frag_contact_list_header.xml
index cb52add..6945a04 100644
--- a/res/layout/frag_contact_list_header.xml
+++ b/res/layout/frag_contact_list_header.xml
@@ -23,7 +23,7 @@
<org.sflphone.views.TACGridView
android:id="@+id/favorites_grid"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:columnWidth="80dp"
android:numColumns="auto_fit"
android:stretchMode="spacingWidth" />
diff --git a/res/layout/frag_dialing.xml b/res/layout/frag_dialing.xml
index d175623..43eb792 100644
--- a/res/layout/frag_dialing.xml
+++ b/res/layout/frag_dialing.xml
@@ -51,7 +51,6 @@
android:layout_height="wrap_content"
android:layout_below="@+id/keyboard_choice"
android:layout_centerHorizontal="true"
- android:adjustViewBounds="true"
android:background="@drawable/item_contact_selector"
android:gravity="center_vertical"
android:src="@drawable/ic_action_call" />
diff --git a/res/layout/item_contact_starred.xml b/res/layout/item_contact_starred.xml
index e57ba39..2ff239a 100644
--- a/res/layout/item_contact_starred.xml
+++ b/res/layout/item_contact_starred.xml
@@ -7,8 +7,8 @@
<ImageView
android:id="@+id/photo"
- android:layout_width="60dp"
- android:layout_height="60dp"
+ android:layout_width="70dp"
+ android:layout_height="70dp"
android:scaleType="centerCrop"
android:layout_centerHorizontal="true"
android:contentDescription="@string/contact_picture_description"/>
diff --git a/res/menu/ac_call.xml b/res/menu/ac_call.xml
new file mode 100644
index 0000000..7e74699
--- /dev/null
+++ b/res/menu/ac_call.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/menuitem_chat"
+ android:showAsAction="always"
+ android:icon="@drawable/ic_action_chat"
+ android:title="@string/ab_action_chat"/>
+
+</menu>
\ No newline at end of file
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8697f41..44dca05 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -37,7 +37,7 @@
<!-- SFLPhoneActivity -->
<string name="close_msg">Appuyer de nouveau pour quitter</string>
<string name="title_section0">Numéroter</string>
- <string name="title_section1">Appeller</string>
+ <string name="title_section1">Appeler</string>
<string name="title_section2">Historique</string>
<string name="title_activity_sflphone_home">SFLphone</string>
<string name="create_new_account_dialog_title">Aucun compte SIP enregistré</string>
@@ -49,6 +49,7 @@
<string name="ab_account_creation">Nouveau compte</string>
<string name="ab_account_edition_1">Supprimer</string>
<string name="ab_account_edition_2">Éditer</string>
+ <string name="ab_action_chat">Message Texte</string>
<!-- Left Drawer -->
<!-- Accessibility -->
@@ -195,7 +196,8 @@
<string name="title_audio_ringtone_field">Ringtone</string>
<string name="dialogtitle_audio_ringtone_field">Ringtone</string>
- <!-- Call Actions -->
+ <!-- Call Fragment -->
+ <string name="me">Moi</string>
<string name="action_call_attended_transfer">Transfert</string>
<string name="action_call_unattended_transfer">Transfert Direct</string>
<string name="action_call_general_transfer">Transfert</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index df0ea88..2b38a86 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -196,7 +196,8 @@
<string name="title_audio_ringtone_field">Ringtone</string>
<string name="dialogtitle_audio_ringtone_field">Ringtone</string>
- <!-- Call Actions -->
+ <!-- Call Fragment -->
+ <string name="me">Me</string>
<string name="action_call_attended_transfer">Attended Transfer</string>
<string name="action_call_unattended_transfer">Unattended transfer</string>
<string name="action_call_general_transfer">Transfer</string>
