* #23663 Integrated new drawing in App (check action bar icon)
diff --git a/res/drawable/callee.png b/res/drawable/callee.png
new file mode 100644
index 0000000..1d1ecd4
--- /dev/null
+++ b/res/drawable/callee.png
Binary files differ
diff --git a/res/drawable/me.png b/res/drawable/me.png
new file mode 100644
index 0000000..880e64f
--- /dev/null
+++ b/res/drawable/me.png
Binary files differ
diff --git a/res/layout/bubbleview_layout.xml b/res/layout/bubbleview_layout.xml
new file mode 100644
index 0000000..ceeafa3
--- /dev/null
+++ b/res/layout/bubbleview_layout.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent" >
+
+ <com.savoirfairelinux.sflphone.model.BubblesView
+ android:id="@+id/main_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentTop="true"
+ android:focusable="true" />
+
+ <Button
+ android:id="@+id/add_bubble"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:text="Add Bubble" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/menu/activity_sflphone_home.xml b/res/menu/activity_sflphone_home.xml
index d78d6f5..cea64de 100644
--- a/res/menu/activity_sflphone_home.xml
+++ b/res/menu/activity_sflphone_home.xml
@@ -1,7 +1,17 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/menu_settings"
- android:title="@string/menu_settings"
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/menu_settings"
+ android:icon="@drawable/ic_menu_settings"
android:orderInCategory="100"
android:showAsAction="ifRoom"
- android:icon="@drawable/ic_menu_settings" />
-</menu>
+ android:title="@string/menu_settings"/>
+
+ <item
+ android:id="@+id/menu_custom_draw"
+ android:icon="@drawable/ic_contact_picture"
+ android:orderInCategory="200"
+ android:showAsAction="ifRoom"
+ android:title="Bubbles"/>
+
+</menu>
\ No newline at end of file
