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

Commit f1a16e41 authored by josephpv's avatar josephpv
Browse files

Scale PS space animations to display on tablet 

Screenshots:
b/336235352#comment10

Bug: 336235352
Test: Manual
Change-Id: I05c97756d788d58cd8d553317d3173b8a250348d
parent 87334e9c

res/layout-sw600dp/private_space_setlock_screen.xml

0 → 100644
+51 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<com.google.android.setupdesign.GlifLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/ps_fragment_lock"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:filterTouchesWhenObscured="true"

    app:sucHeaderText="@string/private_space_lockscreen_title"

    app:sudDescriptionText="@string/private_space_lockscreen_summary"

    android:icon="@drawable/ic_lock">

    <LinearLayout

        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"/>

        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            style="@style/SudContentFrame">

            <com.airbnb.lottie.LottieAnimationView

                android:id="@+id/lottie_animation"

                style="@style/SudContentIllustration"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                app:lottie_autoPlay="true"

                app:lottie_loop="true"

                app:lottie_rawRes="@raw/private_space_use_screen_lock_illustration"

                />

        </FrameLayout>

    </LinearLayout>

</com.google.android.setupdesign.GlifLayout>
 
 No newline at end of file

res/layout-sw600dp/private_space_setup_success.xml

0 → 100644
+50 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<com.google.android.setupdesign.GlifLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/private_space_setup_success"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:filterTouchesWhenObscured="true"

    app:sucHeaderText="@string/private_space_success_title"

    app:sudDescriptionText="@string/private_space_access_text"

    android:icon="@drawable/ic_privatespace_done">

    <LinearLayout

        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"/>

        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            style="@style/SudContentFrame">

            <com.airbnb.lottie.LottieAnimationView

                android:id="@+id/lottie_animation"

                style="@style/SudContentIllustration"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                app:lottie_autoPlay="true"

                app:lottie_loop="true"

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

        </FrameLayout>

    </LinearLayout>

</com.google.android.setupdesign.GlifLayout>

res/values/config.xml

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


    <!-- 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>