mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-04-25 05:28:32 +00:00
Fixed toggle setting color when disabled & off, disable early media ringing toggle if early media ringing is disabled
This commit is contained in:
parent
7bead679ad
commit
18e15b60a4
2 changed files with 4 additions and 1 deletions
|
|
@ -1,6 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<item android:state_enabled="false" android:color="?attr/color_success_700" />
|
<item android:state_enabled="false" android:state_checked="true" android:color="?attr/color_success_700" />
|
||||||
|
<item android:state_enabled="false" android:state_checked="false" android:color="?attr/color_main2_300" />
|
||||||
<item android:state_checked="true" android:color="?attr/color_success_500" />
|
<item android:state_checked="true" android:color="?attr/color_success_500" />
|
||||||
<item android:color="?attr/color_main2_400"/>
|
<item android:color="?attr/color_main2_400"/>
|
||||||
</selector>
|
</selector>
|
||||||
|
|
|
||||||
|
|
@ -234,6 +234,7 @@
|
||||||
android:text="@string/settings_advanced_ring_during_early_media_title"
|
android:text="@string/settings_advanced_ring_during_early_media_title"
|
||||||
android:maxLines="2"
|
android:maxLines="2"
|
||||||
android:ellipsize="end"
|
android:ellipsize="end"
|
||||||
|
android:enabled="@{viewModel.acceptEarlyMedia}"
|
||||||
app:layout_constraintTop_toTopOf="@id/ring_during_early_media_switch"
|
app:layout_constraintTop_toTopOf="@id/ring_during_early_media_switch"
|
||||||
app:layout_constraintBottom_toBottomOf="@id/ring_during_early_media_switch"
|
app:layout_constraintBottom_toBottomOf="@id/ring_during_early_media_switch"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
|
@ -247,6 +248,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="20dp"
|
android:layout_marginTop="20dp"
|
||||||
android:layout_marginEnd="16dp"
|
android:layout_marginEnd="16dp"
|
||||||
|
android:enabled="@{viewModel.acceptEarlyMedia}"
|
||||||
android:checked="@{viewModel.ringDuringEarlyMedia}"
|
android:checked="@{viewModel.ringDuringEarlyMedia}"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/accept_early_media_switch" />
|
app:layout_constraintTop_toBottomOf="@id/accept_early_media_switch" />
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue