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

Commit 8d61d355 authored by Yi-an Chen's avatar Yi-an Chen Committed by Android (Google) Code Review
Browse files

Merge "[XPD] Use DrawableStateLayout background" into main

parents a409f98e ad7c4b9c

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

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
    limitations under the License.

  -->



<LinearLayout

<com.android.settingslib.widget.DrawableStateLinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"
@@ -58,4 +58,4 @@ 
            android:id="@+id/selector_extra_widget"

            style="?expressiveSelectorWithWidgetPreferenceExtraWidgetImageStyle" />

    </LinearLayout>

</LinearLayout>
 
</com.android.settingslib.widget.DrawableStateLinearLayout>

packages/SettingsLib/SelectorWithWidgetPreference/res/values-v36/styles_preference_expressive.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
    </style>



    <style name="ExpressiveSelectorWithWidgetPreferenceRootLayoutStyle">

        <item name="android:background">?android:attr/selectableItemBackground</item>

        <item name="android:background">@drawable/settingslib_round_background_stateful</item>

        <item name="android:gravity">center_vertical</item>

        <item name="android:minHeight">?android:attr/listPreferredItemHeightSmall</item>

        <item name="android:paddingStart">?android:attr/listPreferredItemPaddingStart</item>

packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background.xml

+3 −1
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ 
  -->



<ripple xmlns:android="http://schemas.android.com/apk/res/android"

    android:color="?android:colorControlHighlight">

    android:color="?android:colorControlHighlight"

    android:paddingStart="32dp"

    android:paddingEnd="32dp">

    <item

        android:start="?android:attr/listPreferredItemPaddingStart"

        android:end="?android:attr/listPreferredItemPaddingEnd">

packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_bottom.xml

+3 −1
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ 
  -->



<ripple xmlns:android="http://schemas.android.com/apk/res/android"

    android:color="?android:colorControlHighlight">

    android:color="?android:colorControlHighlight"

    android:paddingStart="32dp"

    android:paddingEnd="32dp">

    <item

        android:start="?android:attr/listPreferredItemPaddingStart"

        android:end="?android:attr/listPreferredItemPaddingEnd">

packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_center.xml

+3 −1
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ 
  -->



<ripple xmlns:android="http://schemas.android.com/apk/res/android"

    android:color="?android:colorControlHighlight">

    android:color="?android:colorControlHighlight"

    android:paddingStart="32dp"

    android:paddingEnd="32dp">

    <item

        android:start="?android:attr/listPreferredItemPaddingStart"

        android:end="?android:attr/listPreferredItemPaddingEnd">