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

Commit f368f58b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update filename to avoid conflict during build time" into main

parents 9e143645 92979151

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