diff options
| author | 2024-12-20 10:48:19 -0800 | |
|---|---|---|
| committer | 2025-02-28 23:13:27 -0800 | |
| commit | 830f6bf6aa7fdc12d0c902c2fbd3adc78034f462 (patch) | |
| tree | f87274edb99988caccd5ea48bbe8923e3e1790aa | |
| parent | a1019aae992f761aeb81826a210f5169939bf40b (diff) | |
[XPD] Rename to settingslib_expressive_preference_selector_with_widget
Rename layout-v36/preference_selector_with_widget to
layout-v36/settingslib_expressive_preference_selector_with_widget,
allowing us to modify the expressive-design-enabled version of this
layout separately from the previous layout.
(This probably shouldn't have been named
layout-v36/preference_selector_with_widget to begin with, because it
would override this file even when expressive design is disabled.)
Test: manual
Relnote: N/A
Flag: com.android.settingslib.widget.theme.flags.is_expressive_design_enabled
Bug: 393978591
Bug: 375481245
Change-Id: I1a768d80954750757b9c29b8ccd8462b6ae1282c
| -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 = |