* #36505: toggle speakers button added in call screen
Ringtones are routed to speakers for incoming calls
diff --git a/res/drawable-hdpi/ic_action_volume_on.png b/res/drawable-hdpi/ic_action_volume_on.png
new file mode 100644
index 0000000..a5a4b20
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_volume_on.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_volume_on.png b/res/drawable-mdpi/ic_action_volume_on.png
new file mode 100644
index 0000000..629b879
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_volume_on.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_volume_on.png b/res/drawable-xhdpi/ic_action_volume_on.png
new file mode 100644
index 0000000..d7754f9
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_volume_on.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_volume_on.png b/res/drawable-xxhdpi/ic_action_volume_on.png
new file mode 100644
index 0000000..87f2bc8
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_volume_on.png
Binary files differ
diff --git a/res/drawable/bg_216.png b/res/drawable/bg_216.png
deleted file mode 100644
index b7270e9..0000000
--- a/res/drawable/bg_216.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/toggle_speaker_selector.xml b/res/drawable/toggle_speaker_selector.xml
new file mode 100644
index 0000000..7fed3f3
--- /dev/null
+++ b/res/drawable/toggle_speaker_selector.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_checked="false"><layer-list>
+ <item><shape android:shape="rectangle">
+ <solid android:color="@color/sfl_blue_0" />
+
+ <stroke android:width="1dp" android:color="@color/sfl_blue_lines" />
+
+ <corners android:radius="2dp" />
+
+ <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
+ </shape></item>
+ <item><bitmap android:gravity="center_horizontal" android:src="@drawable/ic_action_volume_on" />
+ </item>
+ </layer-list></item>
+ <item android:state_checked="true"><layer-list>
+ <item><shape android:shape="rectangle">
+ <solid android:color="@color/sfl_action_blue" />
+
+ <stroke android:width="1dp" android:color="@color/sfl_blue_lines" />
+
+ <corners android:radius="2dp" />
+
+ <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
+ </shape></item>
+ <item><bitmap android:gravity="center_horizontal" android:src="@drawable/ic_action_volume_on" />
+ </item>
+ </layer-list></item>
+
+</selector>
\ No newline at end of file
diff --git a/res/layout/frag_call.xml b/res/layout/frag_call.xml
index cea330f..80f1914 100644
--- a/res/layout/frag_call.xml
+++ b/res/layout/frag_call.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg_72"
- android:divider="@drawable/divider"
- android:orientation="vertical"
- android:showDividers="middle" >
+ android:divider="@drawable/divider" >
<RelativeLayout
+ android:id="@+id/call_status_bar"
android:layout_width="match_parent"
- android:layout_height="?android:attr/actionBarSize" >
+ android:layout_height="?android:attr/actionBarSize"
+ android:layout_alignParentTop="true" >
<ImageView
android:id="@+id/button1"
@@ -37,9 +37,9 @@
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/dialpad_btn"
android:singleLine="true"
- android:textSize="12sp"
android:textAppearance="?android:attr/textAppearanceLarge"
- android:textColor="@color/white" />
+ android:textColor="@color/white"
+ android:textSize="12sp" />
<ImageButton
android:id="@+id/dialpad_btn"
@@ -50,21 +50,22 @@
android:layout_marginRight="10dp"
android:background="#00000000"
android:src="@drawable/ic_action_dial_pad_light" />
-
- <ToggleButton
- android:id="@+id/toggle_speaker"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
- android:text="Speaker" />
-
</RelativeLayout>
<org.sflphone.model.BubblesView
android:id="@+id/main_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_below="@+id/call_status_bar"
android:focusable="true" />
-</LinearLayout>
\ No newline at end of file
+ <ToggleButton
+ android:id="@+id/speaker_toggle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:background="@drawable/toggle_speaker_selector"
+ android:textOff=""
+ android:textOn="" />
+
+</RelativeLayout>
\ No newline at end of file
