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

Commit 0d03c3b5 authored by Noah Wang's avatar Noah Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix content description and accessibility focus on... 

Merge "Fix content description and accessibility focus on PreviewSeekBarPreferenceFragment. Bug: 27911511" into nyc-dev
parents 858a1c6f 9faec560

res/layout/preview_seek_bar_view_pager.xml

+1 −1
Original line number Diff line number Diff line
@@ -39,6 +39,6 @@ 
        android:text="@string/screen_zoom_preview_title"

        android:textAppearance="@android:style/TextAppearance.Material.Widget.ActionBar.Title"

        android:textColor="@color/seek_bar_preference_preview_text"

        android:accessibilityTraversalBefore="@id/preview_pager"/>

        android:importantForAccessibility="no" />

</LinearLayout>

res/layout/screen_zoom_preview_1.xml

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fillViewport="true" >

    android:fillViewport="true"

    android:importantForAccessibility="noHideDescendants">



    <view class="com.android.settings.TouchBlockingFrameLayout"

        android:id="@+id/frame"
@@ -31,8 +32,7 @@ 
            android:paddingTop="@dimen/conversation_message_list_padding"

            android:paddingStart="@dimen/conversation_message_list_padding"

            android:paddingEnd="@dimen/conversation_message_list_padding"

            android:orientation="vertical"

            android:importantForAccessibility="noHideDescendants">

            android:orientation="vertical">



            <com.android.settings.display.ConversationMessageView

                android:layout_width="match_parent"

src/com/android/settings/PreviewPagerAdapter.java

+0 −3
Original line number Diff line number Diff line
@@ -60,9 +60,6 @@ public class PreviewPagerAdapter extends PagerAdapter { 
            mPreviewFrames[i].setLayoutParams(new LinearLayout.LayoutParams(

                    LinearLayout.LayoutParams.MATCH_PARENT,

                    LinearLayout.LayoutParams.MATCH_PARENT));

            mPreviewFrames[i].setContentDescription(

                    context.getString(R.string.preview_page_indicator_content_description, i + 1,

                            previewSampleResIds.length));



            for (Configuration configuration : configurations) {

                // Create a new configuration for the specified value. It won't