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

Commit 813a3732 authored by Saumya Prakash's avatar Saumya Prakash Committed by Automerger Merge Worker
Browse files

Merge "Redesign the gesture tutorial for the Back gesture" into tm-qpr-dev am: 60c419b9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21779343



Change-Id: I00170b244f7e51be704d980b526c19b4980ed954
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9c2a4057 60c419b9

quickstep/AndroidManifest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -103,6 +103,7 @@ 
        <activity android:name="com.android.quickstep.interaction.GestureSandboxActivity"

        <activity android:name="com.android.quickstep.interaction.GestureSandboxActivity"

            android:autoRemoveFromRecents="true"

            android:autoRemoveFromRecents="true"

            android:excludeFromRecents="true"

            android:excludeFromRecents="true"

            android:theme="@style/GestureTutorialActivity"

            android:exported="true">

            android:exported="true">

            <intent-filter>

            <intent-filter>

                <action android:name="com.android.quickstep.action.GESTURE_SANDBOX"/>

                <action android:name="com.android.quickstep.action.GESTURE_SANDBOX"/>

quickstep/res/layout-land/redesigned_gesture_tutorial_mock_hotseat.xml

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

<!--

    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.

-->

<androidx.constraintlayout.widget.ConstraintLayout

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

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

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:paddingVertical="26dp"

    android:paddingHorizontal="56dp">



    <View

        android:id="@+id/hotseat_icon_1"

        android:layout_width="@dimen/gesture_tutorial_hotseat_icon_size"

        android:layout_height="@dimen/gesture_tutorial_hotseat_icon_size"

        android:background="@drawable/hotseat_icon_home"

        android:clipToOutline="true"



        app:layout_constraintBottom_toTopOf="@id/hotseat_icon_2"

        app:layout_constraintVertical_chainStyle="spread_inside"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent" />



    <View

        android:id="@+id/hotseat_icon_2"

        android:layout_width="@dimen/gesture_tutorial_hotseat_icon_size"

        android:layout_height="@dimen/gesture_tutorial_hotseat_icon_size"

        android:background="@drawable/hotseat_icon_home"

        android:clipToOutline="true"



        app:layout_constraintBottom_toTopOf="@id/hotseat_icon_3"

        app:layout_constraintTop_toBottomOf="@id/hotseat_icon_1"

        app:layout_constraintStart_toStartOf="parent" />



    <View

        android:id="@+id/hotseat_icon_3"

        android:layout_width="@dimen/gesture_tutorial_hotseat_icon_size"

        android:layout_height="@dimen/gesture_tutorial_hotseat_icon_size"

        android:background="@drawable/hotseat_icon_home"

        android:clipToOutline="true"



        app:layout_constraintBottom_toTopOf="@id/hotseat_icon_4"

        app:layout_constraintTop_toBottomOf="@id/hotseat_icon_2"

        app:layout_constraintStart_toStartOf="parent" />



    <View

        android:id="@+id/hotseat_icon_4"

        android:layout_width="@dimen/gesture_tutorial_hotseat_icon_size"

        android:layout_height="@dimen/gesture_tutorial_hotseat_icon_size"

        android:background="@drawable/hotseat_icon_home"

        android:clipToOutline="true"



        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toBottomOf="@id/hotseat_icon_3"

        app:layout_constraintBottom_toBottomOf="parent" />



</androidx.constraintlayout.widget.ConstraintLayout>
 
 No newline at end of file

quickstep/res/layout/back_gesture_tutorial_background.xml

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

<!--

     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.

-->

<View

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

    android:id="@+id/back_gesture_tutorial_background"

    android:layout_width="match_parent"

    android:layout_height="match_parent" />

quickstep/res/layout/redesigned_gesture_tutorial_fragment.xml

+18 −20
Original line number Original line Diff line number Diff line
@@ -118,6 +118,14 @@ 
        android:scaleType="fitXY"

        android:scaleType="fitXY"

        android:visibility="gone" />

        android:visibility="gone" />





    <View

        android:id="@+id/exiting_app_back"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_centerVertical="true"

        android:background="@color/gesture_back_tutorial_exiting_app"

        android:visibility="gone" />



    <RelativeLayout

    <RelativeLayout

        android:id="@+id/full_gesture_demonstration"

        android:id="@+id/full_gesture_demonstration"

        android:layout_width="match_parent"

        android:layout_width="match_parent"
@@ -193,43 +201,33 @@ 
            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toBottomOf="@id/gesture_tutorial_fragment_feedback_subtitle" />

            app:layout_constraintTop_toBottomOf="@id/gesture_tutorial_fragment_feedback_subtitle" />





        <ImageView

        <com.airbnb.lottie.LottieAnimationView

            android:id="@+id/gesture_tutorial_checkbox_bg"

            android:id="@+id/checkmark_animation"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginBottom="48dp"

            android:gravity="center"

            android:layout_marginTop="100dp"

            android:scaleType="centerCrop"

            android:background="@drawable/gesture_tutorial_complete_checkmark_bg"

            app:lottie_loop="false"

            android:visibility="gone"

            android:visibility="gone"

            app:layout_constraintBottom_toBottomOf="@id/gesture_tutorial_fragment_action_button"



            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toBottomOf="@id/gesture_tutorial_fragment_feedback_subtitle" />

            app:layout_constraintTop_toBottomOf="@id/gesture_tutorial_fragment_feedback_subtitle" />





        <ImageView

            android:id="@+id/gesture_tutorial_checkbox"

            android:layout_width="124dp"

            android:layout_height="124dp"

            android:background="@drawable/gesture_tutorial_complete_checkmark"

            android:visibility="gone"

            app:layout_constraintBottom_toBottomOf="@id/gesture_tutorial_checkbox_bg"

            app:layout_constraintEnd_toEndOf="@id/gesture_tutorial_checkbox_bg"

            app:layout_constraintStart_toStartOf="@id/gesture_tutorial_checkbox_bg"

            app:layout_constraintTop_toTopOf="@id/gesture_tutorial_checkbox_bg" />



        <Button

        <Button

            android:id="@+id/gesture_tutorial_fragment_action_button"

            android:id="@+id/gesture_tutorial_fragment_action_button"

            style="@style/TextAppearance.GestureTutorial.ButtonLabel"

            style="@style/TextAppearance.GestureTutorial.ButtonLabel"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="48dp"

            android:background="@drawable/gesture_tutorial_action_button_background"

            android:background="@drawable/gesture_tutorial_action_button_background"

            android:stateListAnimator="@null"

            android:stateListAnimator="@null"

            android:text="@string/gesture_tutorial_action_button_label"

            android:text="@string/gesture_tutorial_action_button_label"

            android:visibility="gone"

            android:visibility="invisible"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toBottomOf="@id/gesture_tutorial_checkbox_bg" />

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintTop_toBottomOf="@id/checkmark_animation" />





    </androidx.constraintlayout.widget.ConstraintLayout>

    </androidx.constraintlayout.widget.ConstraintLayout>

quickstep/res/raw/back_gesture_tutorial_animation.json

0 → 100644
+1 −0

File added.

Preview size limit exceeded, changes collapsed.