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

Commit de226a84 authored by David Liu's avatar David Liu Committed by Android (Google) Code Review
Browse files

Merge "[Expressive] Update button preference padding for expressive design" into main

parents 7b9cf5ac 8c582c67

packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_filled.xml

+1 −3
Original line number Diff line number Diff line
@@ -18,9 +18,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

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

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    style="@style/SettingsLibButtonPreferenceStyle.Expressive"

    android:filterTouchesWhenObscured="true">



    <com.google.android.material.button.MaterialButton

packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_filled_extra.xml

+1 −3
Original line number Diff line number Diff line
@@ -18,9 +18,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

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

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    style="@style/SettingsLibButtonPreferenceStyle.Expressive"

    android:filterTouchesWhenObscured="true">



    <com.google.android.material.button.MaterialButton

packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_filled_large.xml

+1 −3
Original line number Diff line number Diff line
@@ -18,9 +18,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

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

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    style="@style/SettingsLibButtonPreferenceStyle.Expressive"

    android:filterTouchesWhenObscured="true">



    <com.google.android.material.button.MaterialButton

packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_outline.xml

+1 −3
Original line number Diff line number Diff line
@@ -18,9 +18,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

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

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    style="@style/SettingsLibButtonPreferenceStyle.Expressive"

    android:filterTouchesWhenObscured="true">



    <com.google.android.material.button.MaterialButton

packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_outline_extra.xml

+1 −3
Original line number Diff line number Diff line
@@ -18,9 +18,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

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

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    style="@style/SettingsLibButtonPreferenceStyle.Expressive"

    android:filterTouchesWhenObscured="true">



    <com.google.android.material.button.MaterialButton