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

Commit 5d9571bc authored by Roy Chou's avatar Roy Chou Committed by Android (Google) Code Review
Browse files

Merge "fix(text preference): fix preview block ui broken in SUW" into main

parents 510b5836 004238d7

res/layout/accessibility_text_reading_preview.xml

+4 −4
Original line number Diff line number Diff line
@@ -19,17 +19,17 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingVertical="@dimen/settingslib_illustration_padding"

    android:paddingEnd="@dimen/text_reading_preview_padding_end"

    android:paddingStart="@dimen/text_reading_preview_padding_start">

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

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



    <LinearLayout

        android:id="@+id/preview_background"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@drawable/accessibility_text_reading_preview"

        android:clipChildren="true"

        android:orientation="vertical"

        android:paddingVertical="@dimen/text_reading_preview_background_padding_vertical"

        android:paddingHorizontal="@dimen/text_reading_preview_background_padding_horizontal">

        android:padding="18dp">



        <TextView

            android:id="@+id/preview_label"

res/values-land/dimens.xml

+5 −3
Original line number Diff line number Diff line
@@ -22,7 +22,9 @@ 
    <dimen name="notif_channel_panel_max_height">300dp</dimen>



    <!-- Text Reading Settings -->

    <dimen name="text_reading_preview_padding_start">64dp</dimen>

    <dimen name="text_reading_preview_padding_end">64dp</dimen>

    <dimen name="text_reading_preview_background_padding_horizontal">72dp</dimen>

    <dimen name="text_reading_preview_layout_padding_horizontal_min">64dp</dimen>

    <dimen name="text_reading_preview_background_padding_horizontal_min">72dp</dimen>



    <dimen name="text_reading_preview_layout_padding_horizontal_min_suw">24dp</dimen>

    <dimen name="text_reading_preview_background_padding_horizontal_min_suw">24dp</dimen>

</resources>

res/values/dimens.xml

+8 −4
Original line number Diff line number Diff line
@@ -223,10 +223,14 @@ 
    <dimen name="message_icon_inset">11dp</dimen>



    <!-- Text Reading Settings -->

    <dimen name="text_reading_preview_padding_start">@*android:dimen/list_item_padding_end_material</dimen>

    <dimen name="text_reading_preview_padding_end">@*android:dimen/list_item_padding_end_material</dimen>

    <dimen name="text_reading_preview_background_padding_vertical">18dp</dimen>

    <dimen name="text_reading_preview_background_padding_horizontal">18dp</dimen>

    <dimen name="text_reading_preview_layout_padding_horizontal_min">

        @*android:dimen/list_item_padding_start_material</dimen>

    <dimen name="text_reading_preview_background_padding_horizontal_min">18dp</dimen>



    <dimen name="text_reading_preview_layout_padding_horizontal_min_suw">

        @dimen/text_reading_preview_layout_padding_horizontal_min</dimen>

    <dimen name="text_reading_preview_background_padding_horizontal_min_suw">

        @dimen/text_reading_preview_background_padding_horizontal_min</dimen>



    <!-- Accessibility Settings -->

    <dimen name="accessibility_layout_margin_start_end">16dp</dimen>

src/com/android/settings/accessibility/TextReadingPreferenceFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class TextReadingPreferenceFragment extends DashboardFragment { 
    static final String BOLD_TEXT_KEY = "toggle_force_bold_text";

    static final String HIGH_TEXT_CONTRAST_KEY = "toggle_high_text_contrast_preference";

    static final String RESET_KEY = "reset";

    private static final String PREVIEW_KEY = "preview";

    static final String PREVIEW_KEY = "preview";

    private static final String NEED_RESET_SETTINGS = "need_reset_settings";

    private static final String LAST_PREVIEW_INDEX = "last_preview_index";

    private static final int UNKNOWN_INDEX = -1;

src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizard.java

+19 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.view.ViewGroup; 


import androidx.recyclerview.widget.RecyclerView;



import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.R;

import com.android.settingslib.Utils;
@@ -41,6 +42,24 @@ import com.google.android.setupdesign.GlifPreferenceLayout; 
 */

public class TextReadingPreferenceFragmentForSetupWizard extends TextReadingPreferenceFragment {



    @Override

    public void addPreferencesFromResource(int preferencesResId) {

        super.addPreferencesFromResource(preferencesResId);



        adjustPreviewPaddingsForSetupWizard();

    }



    @VisibleForTesting

    void adjustPreviewPaddingsForSetupWizard() {

        TextReadingPreviewPreference textReadingPreviewPreference = findPreference(PREVIEW_KEY);

        textReadingPreviewPreference.setLayoutMinHorizontalPadding(

                getContext().getResources().getDimensionPixelSize(

                        R.dimen.text_reading_preview_layout_padding_horizontal_min_suw));

        textReadingPreviewPreference.setBackgroundMinHorizontalPadding(

                getContext().getResources().getDimensionPixelSize(

                        R.dimen.text_reading_preview_background_padding_horizontal_min_suw));

    }



    @Override

    public void onViewCreated(View view, Bundle savedInstanceState) {

        super.onViewCreated(view, savedInstanceState);