Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 830f6bf6 authored by Jay Thomas Sullivan's avatar Jay Thomas Sullivan Committed by Jay Sullivan
Browse files

[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
parent a1019aae

packages/SettingsLib/SelectorWithWidgetPreference/res/layout-v36/preference_selector_with_widget.xml→packages/SettingsLib/SelectorWithWidgetPreference/res/layout-v36/settingslib_expressive_preference_selector_with_widget.xml

+0 −0

File moved.

View file

packages/SettingsLib/SelectorWithWidgetPreference/src/com/android/settingslib/widget/SelectorWithWidgetPreference.java

+4 −1
Original line number Diff line number Diff line
@@ -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 =