dap: Migrate to SelectorWithWidgetPreference

Change-Id: Ie4aaa1fff836a407c1d8f5b919b7b0051748f5d3
urubino^2
LuK1337 9 months ago
parent 8fd19f2d7c
commit 219ef45832
No known key found for this signature in database
  1. 18
      dap/res/xml/dolby_settings.xml
  2. 8
      dap/src/org/lineageos/dap/DolbyFragment.kt

@ -12,40 +12,40 @@
android:key="dolby_top_intro" android:key="dolby_top_intro"
android:title="@string/dolby_top_intro_summary" /> android:title="@string/dolby_top_intro_summary" />
<com.android.settingslib.widget.RadioButtonPreference <com.android.settingslib.widget.SelectorWithWidgetPreference
android:defaultValue="true" android:defaultValue="true"
android:key="dolby_profile_auto" android:key="dolby_profile_auto"
android:title="@string/dolby_profile_auto" /> android:title="@string/dolby_profile_auto" />
<com.android.settingslib.widget.RadioButtonPreference <com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="dolby_profile_game" android:key="dolby_profile_game"
android:title="@string/dolby_profile_game" /> android:title="@string/dolby_profile_game" />
<com.android.settingslib.widget.RadioButtonPreference <com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="dolby_profile_game_1" android:key="dolby_profile_game_1"
android:title="@string/dolby_profile_game_1" /> android:title="@string/dolby_profile_game_1" />
<com.android.settingslib.widget.RadioButtonPreference <com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="dolby_profile_game_2" android:key="dolby_profile_game_2"
android:title="@string/dolby_profile_game_2" /> android:title="@string/dolby_profile_game_2" />
<com.android.settingslib.widget.RadioButtonPreference <com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="dolby_profile_movie" android:key="dolby_profile_movie"
android:title="@string/dolby_profile_movie" /> android:title="@string/dolby_profile_movie" />
<com.android.settingslib.widget.RadioButtonPreference <com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="dolby_profile_music" android:key="dolby_profile_music"
android:title="@string/dolby_profile_music" /> android:title="@string/dolby_profile_music" />
<com.android.settingslib.widget.RadioButtonPreference <com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="dolby_profile_off" android:key="dolby_profile_off"
android:title="@string/dolby_profile_off" /> android:title="@string/dolby_profile_off" />
<com.android.settingslib.widget.RadioButtonPreference <com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="dolby_profile_spacial_audio" android:key="dolby_profile_spacial_audio"
android:title="@string/dolby_profile_spacial_audio" /> android:title="@string/dolby_profile_spacial_audio" />
<com.android.settingslib.widget.RadioButtonPreference <com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="dolby_profile_voice" android:key="dolby_profile_voice"
android:title="@string/dolby_profile_voice" /> android:title="@string/dolby_profile_voice" />

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2022 The LineageOS Project * Copyright (C) 2022-2024 The LineageOS Project
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -23,7 +23,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener
import androidx.preference.PreferenceFragment import androidx.preference.PreferenceFragment
import com.android.settingslib.widget.MainSwitchPreference import com.android.settingslib.widget.MainSwitchPreference
import com.android.settingslib.widget.RadioButtonPreference import com.android.settingslib.widget.SelectorWithWidgetPreference
import org.lineageos.dap.R import org.lineageos.dap.R
@ -39,7 +39,7 @@ class DolbyFragment : PreferenceFragment(), OnCheckedChangeListener {
switchBar.isChecked = DolbyCore.isEnabled() switchBar.isChecked = DolbyCore.isEnabled()
for ((key, value) in PREF_DOLBY_MODES) { for ((key, value) in PREF_DOLBY_MODES) {
val preference = findPreference<RadioButtonPreference>(key)!! val preference = findPreference<SelectorWithWidgetPreference>(key)!!
preference.setOnPreferenceClickListener { preference.setOnPreferenceClickListener {
setProfile(value) setProfile(value)
true true
@ -55,7 +55,7 @@ class DolbyFragment : PreferenceFragment(), OnCheckedChangeListener {
DolbyCore.setProfile(profile) DolbyCore.setProfile(profile)
for ((key, value) in PREF_DOLBY_MODES) { for ((key, value) in PREF_DOLBY_MODES) {
val preference = findPreference<RadioButtonPreference>(key)!! val preference = findPreference<SelectorWithWidgetPreference>(key)!!
preference.isChecked = value == profile preference.isChecked = value == profile
} }
} }

Loading…
Cancel
Save