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

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

Merge "Disable touch when button is obscured" into main

parents 15e08804 2d1f76e1

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

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
    android:layout_height="wrap_content"

    android:orientation="vertical"

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

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

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

    android:filterTouchesWhenObscured="true">



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

        android:id="@+id/settingslib_button"

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

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
    android:layout_height="wrap_content"

    android:orientation="vertical"

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

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

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

    android:filterTouchesWhenObscured="true">



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

        android:id="@+id/settingslib_button"

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

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
    android:layout_height="wrap_content"

    android:orientation="vertical"

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

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

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

    android:filterTouchesWhenObscured="true">



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

        android:id="@+id/settingslib_button"

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

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
    android:layout_height="wrap_content"

    android:orientation="vertical"

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

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

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

    android:filterTouchesWhenObscured="true">



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

        android:id="@+id/settingslib_button"

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

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
    android:layout_height="wrap_content"

    android:orientation="vertical"

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

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

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

    android:filterTouchesWhenObscured="true">



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

        android:id="@+id/settingslib_button"