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

Commit 0f0e27cf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move the text under slider bar to the description under title" into sc-v2-dev

parents 493e889d b5bb0e85

res/layout/font_size_preview.xml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
        android:layout_height="wrap_content">



        <LinearLayout

            android:id="@+id/font_size_preview_text_group"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:paddingTop="16dp"

res/layout/suw_font_size_fragment.xml

+0 −6
Original line number Diff line number Diff line
@@ -75,12 +75,6 @@ 
                    android:contentDescription="@string/font_size_make_larger_desc"

                    style="@style/screen_size_imageview_style"/>

            </LinearLayout>



            <TextView

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/font_size_summary"

                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"/>

        </LinearLayout>

    </LinearLayout>

</androidx.core.widget.NestedScrollView>

res/layout/suw_screen_zoom_fragment.xml

+0 −6
Original line number Diff line number Diff line
@@ -74,12 +74,6 @@ 
                    android:contentDescription="@string/screen_zoom_make_larger_desc"

                    style="@style/screen_size_imageview_style"/>

            </LinearLayout>



            <TextView

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/screen_zoom_summary"

                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"/>

        </LinearLayout>

    </LinearLayout>

</androidx.core.widget.NestedScrollView>

res/values-sw600dp/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -19,4 +19,6 @@ 
    <!-- Dashboard number of columns -->

    <integer name="dashboard_num_columns">2</integer>



    <!-- Whether to support large screen -->

    <bool name="config_supported_large_screen">true</bool>

</resources>

res/values-sw600dp/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -63,6 +63,9 @@ 
    <dimen name="confirm_credentials_side_margin">0dp</dimen>

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



    <!-- padding for font size preview in large screen -->

    <dimen name="font_size_preview_padding_start">32dp</dimen>



    <!-- Padding for screen pinning -->

    <dimen name="screen_pinning_padding_start">40dp</dimen>

    <dimen name="screen_pinning_padding_end">40dp</dimen>