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

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

Merge "Center align illustration is PS setup screen for tablet" into main

parents 16f9205f 6780ee79

res/layout-sw600dp/private_space_setlock_screen.xml

+4 −7
Original line number Diff line number Diff line
@@ -28,11 +28,8 @@ 
        android:id="@+id/sud_layout_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical">

        <Space

            android:id="@+id/space1"

            android:layout_width="1dp"

            android:layout_height="@dimen/private_space_sud_items_margin_inbetween"/>

        android:orientation="vertical"

        android:gravity="center">

        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"
@@ -40,8 +37,8 @@ 
            <com.airbnb.lottie.LottieAnimationView

                android:id="@+id/lottie_animation"

                style="@style/SudContentIllustration"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                app:lottie_autoPlay="true"

                app:lottie_loop="true"

                app:lottie_rawRes="@raw/private_space_use_screen_lock_illustration"

res/layout-sw600dp/private_space_setup_success.xml

+4 −7
Original line number Diff line number Diff line
@@ -28,11 +28,8 @@ 
        android:id="@+id/sud_layout_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical">

        <Space

            android:id="@+id/space1"

            android:layout_width="1dp"

            android:layout_height="@dimen/private_space_sud_items_margin_inbetween"/>

        android:orientation="vertical"

        android:gravity="center">

        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"
@@ -40,8 +37,8 @@ 
            <com.airbnb.lottie.LottieAnimationView

                android:id="@+id/lottie_animation"

                style="@style/SudContentIllustration"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                app:lottie_autoPlay="true"

                app:lottie_loop="true"

                app:lottie_rawRes="@raw/private_space_illustration"/>

res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -839,7 +839,4 @@ 


    <!-- Package name for diagnostics app. -->

    <string name="config_device_diagnostics_package_name" translatable="false">com.android.devicediagnostics</string>



    <!-- Private space setup screen tablet line spacing-->

    <dimen name="private_space_sud_items_margin_inbetween">60dp</dimen>

</resources>