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

Commit 92979151 authored by Mill Chen's avatar Mill Chen
Browse files

Update filename to avoid conflict during build time 

There's an ambiguous resource being provided by settings lib. It's a
conflict with the one in framework/base/res. Rename it for the usage of
settingslib.

Bug: 386753532
Test: visual verify
Flag: EXEMPT resource update
Change-Id: I1de3983e37f62dd7001e71769345bea6e83900f5
parent 8c8593fb

packages/SettingsLib/SelectorWithWidgetPreference/res/layout/preference_widget_checkbox.xml→packages/SettingsLib/SelectorWithWidgetPreference/res/layout/settingslib_preference_widget_checkbox.xml

+0 −0

File moved.

View file

packages/SettingsLib/SelectorWithWidgetPreference/res/layout/preference_widget_radiobutton.xml→packages/SettingsLib/SelectorWithWidgetPreference/res/layout/settingslib_preference_widget_radiobutton.xml

+0 −0

File moved.

View file

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

+2 −2
Original line number Diff line number Diff line
@@ -234,9 +234,9 @@ public class SelectorWithWidgetPreference extends CheckBoxPreference { 
    private void init(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr,

            int defStyleRes) {

        if (mIsCheckBox) {

            setWidgetLayoutResource(R.layout.preference_widget_checkbox);

            setWidgetLayoutResource(R.layout.settingslib_preference_widget_checkbox);

        } else {

            setWidgetLayoutResource(R.layout.preference_widget_radiobutton);

            setWidgetLayoutResource(R.layout.settingslib_preference_widget_radiobutton);

        }

        setLayoutResource(R.layout.preference_selector_with_widget);

        setIconSpaceReserved(false);

packages/SettingsLib/res/layout-v33/preference_checkable_two_target.xml

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
            android:clipToPadding="false"

            android:paddingTop="4dp"

            android:paddingBottom="4dp">

            <include layout="@layout/preference_widget_checkbox" />

            <include layout="@layout/settingslib_preference_widget_checkbox" />

        </LinearLayout>



        <RelativeLayout

packages/SettingsLib/res/layout/preference_checkable_two_target.xml

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
            android:clipToPadding="false"

            android:paddingTop="4dp"

            android:paddingBottom="4dp">

            <include layout="@layout/preference_widget_checkbox" />

            <include layout="@layout/settingslib_preference_widget_checkbox" />

        </LinearLayout>



        <RelativeLayout