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

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

Merge "Cleanup ENABLE_TASKBAR_EDU_TOOLTIP: remove EDU sheet." into udc-dev

parents 643253d4 3ef917a4

quickstep/res/layout/taskbar_edu.xml

deleted100644 → 0
+0 −79
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2021 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.android.launcher3.taskbar.TaskbarEduView xmlns:android="http://schemas.android.com/apk/res/android"

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

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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_gravity="bottom"

    android:gravity="bottom"

    android:orientation="vertical"

    android:layout_marginHorizontal="108dp">



    <androidx.constraintlayout.widget.ConstraintLayout

        android:id="@+id/edu_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@drawable/bg_rounded_corner_bottom_sheet"

        android:gravity="center_horizontal"

        android:paddingHorizontal="36dp"

        android:paddingTop="64dp">



        <com.android.launcher3.taskbar.TaskbarEduPagedView

            android:id="@+id/content"

            android:clipToPadding="false"

            android:layout_width="match_parent"

            android:layout_height="378dp"

            app:layout_constraintTop_toTopOf="parent"

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



        <Button

            android:id="@+id/edu_start_button"

            android:layout_width="wrap_content"

            android:layout_height="36dp"

            android:layout_marginBottom="18dp"

            android:layout_marginTop="32dp"

            app:layout_constraintTop_toBottomOf="@id/content"

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintStart_toStartOf="parent"

            android:text="@string/taskbar_edu_close"

            style="@style/TaskbarEdu.Button.Close"

            android:textColor="?android:attr/textColorPrimary"/>



        <com.android.launcher3.pageindicators.PageIndicatorDots

            android:id="@+id/content_page_indicator"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            app:layout_constraintTop_toTopOf="@id/edu_start_button"

            app:layout_constraintBottom_toBottomOf="@id/edu_start_button"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintEnd_toEndOf="parent"

            android:elevation="1dp" />



        <Button

            android:id="@+id/edu_end_button"

            android:layout_width="wrap_content"

            android:layout_height="0dp"

            app:layout_constraintTop_toTopOf="@id/edu_start_button"

            app:layout_constraintBottom_toBottomOf="@id/edu_start_button"

            app:layout_constraintEnd_toEndOf="parent"

            android:text="@string/taskbar_edu_next"

            style="@style/TaskbarEdu.Button.Next"

            android:textColor="?androidprv:attr/textColorOnAccent"/>

    </androidx.constraintlayout.widget.ConstraintLayout>

</com.android.launcher3.taskbar.TaskbarEduView>
 
 No newline at end of file

quickstep/res/layout/taskbar_edu_features.xml

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ 


    <Button

        android:id="@+id/done_button"

        style="@style/TaskbarEdu.Button.Next"

        style="@style/TaskbarEdu.Button.Done"

        android:layout_width="wrap_content"

        android:layout_height="36dp"

        android:layout_marginTop="32dp"

quickstep/res/layout/taskbar_edu_pages_persistent.xml

deleted100644 → 0
+0 −58
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>

quickstep/res/layout/taskbar_edu_pages_transient.xml

deleted100644 → 0
+0 −78
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_stashing" />



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

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

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

    </LinearLayout>

</merge>
 
 No newline at end of file

quickstep/res/raw/taskbar_edu_stashing_transient.json

deleted100644 → 0
+0 −1

File deleted.

Preview size limit exceeded, changes collapsed.