diff options
| author | 2025-03-01 02:00:35 -0800 | |
|---|---|---|
| committer | 2025-03-01 02:00:35 -0800 | |
| commit | 77baad59be4d5d0d8053073c07450f4677bff9bb (patch) | |
| tree | 0dd9898943aabe9d4f0b665bcde1336528700591 | |
| parent | 732ada83d6fe218824bcca4439be6674709cd3fa (diff) | |
| parent | 830f6bf6aa7fdc12d0c902c2fbd3adc78034f462 (diff) | |
Merge "[XPD] Rename to settingslib_expressive_preference_selector_with_widget" into main
| -rw-r--r-- | packages/SettingsLib/SelectorWithWidgetPreference/res/layout-v36/settingslib_expressive_preference_selector_with_widget.xml (renamed from packages/SettingsLib/SelectorWithWidgetPreference/res/layout-v36/preference_selector_with_widget.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SelectorWithWidgetPreference/src/com/android/settingslib/widget/SelectorWithWidgetPreference.java | 5 |
2 files changed, 4 insertions, 1 deletions
diff --git a/packages/SettingsLib/SelectorWithWidgetPreference/res/layout-v36/preference_selector_with_widget.xml b/packages/SettingsLib/SelectorWithWidgetPreference/res/layout-v36/settingslib_expressive_preference_selector_with_widget.xml index a79d69dbff8c..a79d69dbff8c 100644 --- a/packages/SettingsLib/SelectorWithWidgetPreference/res/layout-v36/preference_selector_with_widget.xml +++ b/packages/SettingsLib/SelectorWithWidgetPreference/res/layout-v36/settingslib_expressive_preference_selector_with_widget.xml diff --git a/packages/SettingsLib/SelectorWithWidgetPreference/src/com/android/settingslib/widget/SelectorWithWidgetPreference.java b/packages/SettingsLib/SelectorWithWidgetPreference/src/com/android/settingslib/widget/SelectorWithWidgetPreference.java index cde8b332f2e7..465b6ccf4d9c 100644 --- a/packages/SettingsLib/SelectorWithWidgetPreference/src/com/android/settingslib/widget/SelectorWithWidgetPreference.java +++ b/packages/SettingsLib/SelectorWithWidgetPreference/src/com/android/settingslib/widget/SelectorWithWidgetPreference.java @@ -238,7 +238,10 @@ public class SelectorWithWidgetPreference extends CheckBoxPreference { } else { setWidgetLayoutResource(R.layout.settingslib_preference_widget_radiobutton); } - setLayoutResource(R.layout.preference_selector_with_widget); + int resID = SettingsThemeHelper.isExpressiveTheme(context) + ? R.layout.settingslib_expressive_preference_selector_with_widget + : R.layout.preference_selector_with_widget; + setLayoutResource(resID); setIconSpaceReserved(false); final TypedArray a = |