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

Commit 933971ff authored by Joseph Vincent's avatar Joseph Vincent Committed by Android (Google) Code Review
Browse files

Merge "Fix to display text properly in PS education screen" into main

parents 06ee9cdb cbf3dad3

res/layout/private_space_education_screen.xml

+1 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
        android:layout_height="match_parent">

    <LinearLayout

        android:id="@+id/sud_layout_icon_container"

        style="@style/SudContentFrame"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical">
@@ -37,8 +38,6 @@ 
            android:id="@+id/lottie_animation"

            style="@style/SudContentIllustration"

            android:layout_width="match_parent"

            android:layout_marginLeft="24dp"

            android:layout_marginRight="24dp"

            android:layout_height="match_parent"

            app:lottie_autoPlay="true"

            app:lottie_loop="true"

res/values/styles.xml

+0 −4
Original line number Diff line number Diff line
@@ -968,8 +968,6 @@ 
    </style>



    <style name="PrivateSpaceSetupSubHeaderStyle" parent="@style/PrivateSpaceSetupTextFontStyle">

        <item name="android:paddingLeft">24dp</item>

        <item name="android:paddingRight">24dp</item>

        <item name="android:paddingTop">20dp</item>

        <item name="android:paddingBottom">8dp</item>

        <item name="android:textSize">14sp</item>
@@ -977,8 +975,6 @@ 
    </style>



    <style name="PrivateSpaceSetupBulletPointLayoutStyle">

        <item name="android:paddingLeft">24dp</item>

        <item name="android:paddingRight">24dp</item>

        <item name="android:paddingTop">16dp</item>

        <item name="android:paddingBottom">16dp</item>

        <item name="android:layout_width">fill_parent</item>