diff --git a/app/src/main/res/layout-land/call_incoming_fragment.xml b/app/src/main/res/layout-land/call_incoming_fragment.xml index 2a00f25ba..33b45dfe6 100644 --- a/app/src/main/res/layout-land/call_incoming_fragment.xml +++ b/app/src/main/res/layout-land/call_incoming_fragment.xml @@ -118,7 +118,7 @@ android:id="@+id/bottom_bar" layout="@layout/call_incoming_actions" android:layout_width="0dp" - android:layout_height="wrap_content" + android:layout_height="@dimen/call_main_actions_menu_height" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/call_actions_generic.xml b/app/src/main/res/layout/call_actions_generic.xml index 4c5669e8a..d7c5c4658 100644 --- a/app/src/main/res/layout/call_actions_generic.xml +++ b/app/src/main/res/layout/call_actions_generic.xml @@ -12,7 +12,6 @@ @@ -60,6 +60,7 @@ app:tint="@color/in_call_button_tint_color" app:layout_constraintHorizontal_bias="1" app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintTop_toBottomOf="@id/call_actions_handle" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/hang_up" app:layout_constraintEnd_toStartOf="@id/toggle_mute_mic" /> @@ -76,6 +77,7 @@ android:background="@drawable/in_call_button_background_red" android:contentDescription="@string/content_description_toggle_microphone" app:tint="@color/in_call_button_tint_color" + app:layout_constraintTop_toBottomOf="@id/call_actions_handle" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/toggle_video" app:layout_constraintEnd_toStartOf="@id/change_audio_output" /> @@ -91,6 +93,7 @@ android:background="@drawable/in_call_button_background_red" android:contentDescription="@string/content_description_change_output_audio_device" app:tint="@color/in_call_button_tint_color" + app:layout_constraintTop_toBottomOf="@id/call_actions_handle" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/toggle_mute_mic" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/app/src/main/res/layout/call_ended_actions.xml b/app/src/main/res/layout/call_ended_actions.xml index 0b9b99057..ff06036ec 100644 --- a/app/src/main/res/layout/call_ended_actions.xml +++ b/app/src/main/res/layout/call_ended_actions.xml @@ -12,9 +12,22 @@ + + @@ -45,6 +59,7 @@ app:tint="@color/gray_400" app:layout_constraintHorizontal_bias="1" app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintTop_toBottomOf="@id/call_actions_handle" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/hang_up" app:layout_constraintEnd_toStartOf="@id/toggle_mute_mic" /> @@ -59,6 +74,7 @@ android:contentDescription="@null" android:background="@drawable/shape_round_in_call_disabled_button_background" app:tint="@color/gray_400" + app:layout_constraintTop_toBottomOf="@id/call_actions_handle" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/toggle_video" app:layout_constraintEnd_toStartOf="@id/change_audio_output" /> @@ -73,6 +89,7 @@ android:contentDescription="@null" android:background="@drawable/shape_round_in_call_disabled_button_background" app:tint="@color/gray_400" + app:layout_constraintTop_toBottomOf="@id/call_actions_handle" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/toggle_mute_mic" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/app/src/main/res/layout/call_incoming_actions.xml b/app/src/main/res/layout/call_incoming_actions.xml index 17b958237..7cde705fc 100644 --- a/app/src/main/res/layout/call_incoming_actions.xml +++ b/app/src/main/res/layout/call_incoming_actions.xml @@ -11,10 +11,8 @@ + android:layout_height="@dimen/call_main_actions_menu_height" + android:background="@drawable/shape_call_bottom_sheet_background"> diff --git a/app/src/main/res/layout/call_outgoing_actions.xml b/app/src/main/res/layout/call_outgoing_actions.xml index 4eb0886c3..6893b6c84 100644 --- a/app/src/main/res/layout/call_outgoing_actions.xml +++ b/app/src/main/res/layout/call_outgoing_actions.xml @@ -12,9 +12,22 @@ + + @@ -45,6 +59,7 @@ app:tint="@color/gray_400" app:layout_constraintHorizontal_bias="1" app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintTop_toBottomOf="@id/call_actions_handle" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/hang_up" app:layout_constraintEnd_toStartOf="@id/toggle_mute_mic" /> @@ -61,6 +76,7 @@ android:background="@drawable/in_call_button_background_red" app:tint="@color/in_call_button_tint_color" app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@id/call_actions_handle" app:layout_constraintStart_toEndOf="@id/toggle_video" app:layout_constraintEnd_toStartOf="@id/change_audio_output" /> @@ -76,6 +92,7 @@ android:src="@{viewModel.isHeadsetEnabled ? @drawable/headset : viewModel.isBluetoothEnabled ? @drawable/bluetooth : viewModel.isSpeakerEnabled ? @drawable/speaker_high : @drawable/speaker_slash, default=@drawable/speaker_slash}" android:background="@drawable/in_call_button_background_red" app:tint="@color/in_call_button_tint_color" + app:layout_constraintTop_toBottomOf="@id/call_actions_handle" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/toggle_mute_mic" app:layout_constraintEnd_toEndOf="parent" />