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

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

Merge "[Expressive design] Refine SelectorWithWidget" into main

parents 3fd1a21c f848fb46

packages/SettingsLib/SelectorWithWidgetPreference/res/layout-v33/preference_selector_with_widget.xml→packages/SettingsLib/SelectorWithWidgetPreference/res/layout-v33/settingslib_preference_selector_with_widget.xml

+0 −0

File moved.

View file

packages/SettingsLib/SelectorWithWidgetPreference/res/layout-v36/settingslib_selector_with_widget.xml→packages/SettingsLib/SelectorWithWidgetPreference/res/layout-v36/settingslib_preference_selector_with_widget.xml

+0 −0

File moved.

View file

packages/SettingsLib/SelectorWithWidgetPreference/res/layout/preference_selector_with_widget.xml→packages/SettingsLib/SelectorWithWidgetPreference/res/layout/settingslib_preference_selector_with_widget.xml

+0 −0

File moved.

View file

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

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ public class SelectorWithWidgetPreference extends CheckBoxPreference { 
        } else {

            setWidgetLayoutResource(R.layout.settingslib_preference_widget_radiobutton);

        }

        setLayoutResource(R.layout.preference_selector_with_widget);

        setLayoutResource(R.layout.settingslib_preference_selector_with_widget);

        setIconSpaceReserved(false);



        final TypedArray a =

packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/SelectorWithWidgetPreferenceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public class SelectorWithWidgetPreferenceTest { 
    @Test

    public void shouldHaveRadioPreferenceLayout() {

        assertThat(mPreference.getLayoutResource()).isEqualTo(

                R.layout.preference_selector_with_widget);

                R.layout.settingslib_preference_selector_with_widget);

    }



    @Test