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

Commit ddc7ef2e authored by Brian Isganitis's avatar Brian Isganitis Committed by Android (Google) Code Review
Browse files

Merge "Add EDU lottie animations for persistent and transient." into tm-qpr-dev

parents 61c23f1e 77de0d5a

quickstep/res/drawable/taskbar_edu_splitscreen.png

deleted100644 → 0
−5.51 KiB
Loading image diff...

quickstep/res/drawable/taskbar_edu_stashing.png

deleted100644 → 0
−5.51 KiB
Loading image diff...

quickstep/res/drawable/taskbar_edu_switch_apps.png

deleted100644 → 0
−5.51 KiB
Loading image diff...

quickstep/res/layout/taskbar_edu.xml

+1 −62
Original line number Diff line number Diff line
@@ -40,68 +40,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="378dp"

            app:layout_constraintTop_toTopOf="parent"

            launcher:pageIndicator="@+id/content_page_indicator">



            <LinearLayout

                android:id="@+id/page_switch_apps"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:gravity="center_horizontal">



                <TextView

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    style="@style/TextAppearance.TaskbarEdu.Title"

                    android:text="@string/taskbar_edu_switch_apps"/>



                <ImageView

                    android:layout_width="322dp"

                    android:layout_height="282dp"

                    android:layout_marginTop="16dp"

                    android:src="@drawable/taskbar_edu_switch_apps"/>

            </LinearLayout>



            <LinearLayout

                android:id="@+id/page_splitscreen"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:gravity="center_horizontal">



                <TextView

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    style="@style/TextAppearance.TaskbarEdu.Title"

                    android:text="@string/taskbar_edu_splitscreen"/>



                <ImageView

                    android:layout_width="322dp"

                    android:layout_height="282dp"

                    android:layout_marginTop="16dp"

                    android:src="@drawable/taskbar_edu_splitscreen"/>

            </LinearLayout>



            <LinearLayout

                android:id="@+id/page_stashing"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:gravity="center_horizontal">



                <TextView

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    style="@style/TextAppearance.TaskbarEdu.Title"

                    android:text="@string/taskbar_edu_stashing"/>



                <ImageView

                    android:layout_width="322dp"

                    android:layout_height="282dp"

                    android:layout_marginTop="16dp"

                    android:src="@drawable/taskbar_edu_stashing"/>

            </LinearLayout>

        </com.android.launcher3.taskbar.TaskbarEduPagedView>

            launcher:pageIndicator="@+id/content_page_indicator" />



        <Button

            android:id="@+id/edu_start_button"

quickstep/res/layout/taskbar_edu_pages_persistent.xml

0 → 100644
+58 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2022 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.

-->



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

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



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:orientation="vertical">



        <TextView

            style="@style/TextAppearance.TaskbarEdu.Title"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@string/taskbar_edu_splitscreen" />



        <com.airbnb.lottie.LottieAnimationView

            android:id="@+id/animation"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="16dp"

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

    </LinearLayout>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:orientation="vertical">



        <TextView

            style="@style/TextAppearance.TaskbarEdu.Title"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@string/taskbar_edu_suggestions" />



        <com.airbnb.lottie.LottieAnimationView

            android:id="@id/animation"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="16dp"

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

    </LinearLayout>

</merge>