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

Commit 2d1f76e1 authored by David Liu's avatar David Liu
Browse files

Disable touch when button is obscured 

HIGH_LEVEL_CL_EXPLANATION:
- Tapjacking is currently possible on the ButtonPreference. Set android:filterTouchesWhenObscured to true to mitigate. (See: https://developer.android.com/privacy-and-security/risks/tapjacking)

Bug: 391937874
Flag: EXEMPT library
Test: atest & manual
Change-Id: I585ddc7669dc5132586e489b329415f9748f8e60
parent 4b45f29b

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"