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

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

Merge "[Expressive design] ActionButtonPreference: improve a11y talkback" into main

parents 5ee5800d a4c8fb24

packages/SettingsLib/ActionButtonsPreference/res/layout-v35/settingslib_expressive_action_buttons.xml

+16 −8
Original line number Diff line number Diff line
@@ -35,11 +35,13 @@ 
            style="@style/SettingsLibActionButton.Expressive"

            android:layout_width="@dimen/settingslib_expressive_space_large3"

            android:layout_height="@dimen/settingslib_expressive_space_medium5"

            android:layout_gravity="center_horizontal" />

            android:layout_gravity="center_horizontal"

            android:importantForAccessibility="no"/>

        <TextView

            android:id="@+id/text1"

            style="@style/SettingsLibActionButton.Expressive.Label"

            android:layout_marginTop="@dimen/settingslib_expressive_space_extrasmall3"/>

            android:layout_marginTop="@dimen/settingslib_expressive_space_extrasmall3"

            android:importantForAccessibility="no"/>



    </LinearLayout>
@@ -55,11 +57,13 @@ 
            style="@style/SettingsLibActionButton.Expressive"

            android:layout_width="@dimen/settingslib_expressive_space_large3"

            android:layout_height="@dimen/settingslib_expressive_space_medium5"

            android:layout_gravity="center_horizontal" />

            android:layout_gravity="center_horizontal"

            android:importantForAccessibility="no"/>

        <TextView

            android:id="@+id/text2"

            style="@style/SettingsLibActionButton.Expressive.Label"

            android:layout_marginTop="@dimen/settingslib_expressive_space_extrasmall3"/>

            android:layout_marginTop="@dimen/settingslib_expressive_space_extrasmall3"

            android:importantForAccessibility="no"/>



    </LinearLayout>
@@ -75,11 +79,13 @@ 
            style="@style/SettingsLibActionButton.Expressive"

            android:layout_width="@dimen/settingslib_expressive_space_large3"

            android:layout_height="@dimen/settingslib_expressive_space_medium5"

            android:layout_gravity="center_horizontal" />

            android:layout_gravity="center_horizontal"

            android:importantForAccessibility="no"/>

        <TextView

            android:id="@+id/text3"

            style="@style/SettingsLibActionButton.Expressive.Label"

            android:layout_marginTop="@dimen/settingslib_expressive_space_extrasmall3"/>

            android:layout_marginTop="@dimen/settingslib_expressive_space_extrasmall3"

            android:importantForAccessibility="no"/>



    </LinearLayout>
@@ -95,10 +101,12 @@ 
            style="@style/SettingsLibActionButton.Expressive"

            android:layout_width="@dimen/settingslib_expressive_space_large3"

            android:layout_height="@dimen/settingslib_expressive_space_medium5"

            android:layout_gravity="center_horizontal" />

            android:layout_gravity="center_horizontal"

            android:importantForAccessibility="no"/>

        <TextView

            android:id="@+id/text4"

            style="@style/SettingsLibActionButton.Expressive.Label"

            android:layout_marginTop="@dimen/settingslib_expressive_space_extrasmall3"/>

            android:layout_marginTop="@dimen/settingslib_expressive_space_extrasmall3"

            android:importantForAccessibility="no"/>

    </LinearLayout>

</LinearLayout>

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

+6 −4
Original line number Diff line number Diff line
@@ -548,15 +548,17 @@ public class ActionButtonsPreference extends Preference { 
                if (mButton instanceof MaterialButton) {

                    ((MaterialButton) mButton).setIcon(mIcon);

                }

                mButton.setEnabled(mIsEnabled);

                mActionLayout.setOnClickListener(mListener);

                mActionLayout.setEnabled(mIsEnabled);

                mActionLayout.setContentDescription(mText);

            } else {

                mButton.setText(mText);

                mButton.setCompoundDrawablesWithIntrinsicBounds(

                        null /* left */, mIcon /* top */, null /* right */, null /* bottom */);

            }



                mButton.setOnClickListener(mListener);

                mButton.setEnabled(mIsEnabled);



            }



            if (shouldBeVisible()) {

                mButton.setVisibility(View.VISIBLE);