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

Commit 2256dfce authored by Schneider Victor-tulias's avatar Schneider Victor-tulias Committed by Automerger Merge Worker
Browse files

Merge "Update gesture nav edu motion and colors" into udc-dev am: b4e91b14 

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



Change-Id: Iff7fbb1e78187683ec38a46f682dacc8d107a3e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 23591721 b4e91b14

quickstep/res/layout-sw600dp-land/gesture_tutorial_step_menu.xml

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ 
        android:layout_marginVertical="16dp"

        android:text="@string/gesture_tutorial_action_button_label"

        android:background="@drawable/gesture_tutorial_action_button_background"

        android:backgroundTint="?androidprv:attr/materialColorPrimary"

        android:stateListAnimator="@null"



        app:layout_constraintTop_toBottomOf="@id/guideline"

quickstep/res/layout/gesture_tutorial_fragment.xml

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ 
            android:paddingEnd="26dp"

            android:text="@string/gesture_tutorial_action_button_label"

            android:background="@drawable/gesture_tutorial_action_button_background"

            android:backgroundTint="?android:attr/colorAccent"

            android:stateListAnimator="@null"

            android:visibility="invisible"

quickstep/res/layout/gesture_tutorial_mock_task_view.xml

deleted100644 → 0
+0 −21
Original line number 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:theme="@style/GestureTutorialActivity"

    android:id="@+id/overview_gesture_tutorial_shape"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_margin="20dp"

    android:background="?attr/onSurfaceOverview" />
 
 No newline at end of file

quickstep/res/layout/gesture_tutorial_step_menu.xml

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ 
        android:layout_marginVertical="16dp"

        android:text="@string/gesture_tutorial_action_button_label"

        android:background="@drawable/gesture_tutorial_action_button_background"

        android:backgroundTint="?androidprv:attr/materialColorPrimary"

        android:stateListAnimator="@null"



        app:layout_constraintTop_toBottomOf="@id/guideline"

quickstep/res/layout/swipe_up_gesture_tutorial_shape.xml

deleted100644 → 0
+0 −20
Original line number 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:theme="@style/GestureTutorialActivity"

    android:id="@+id/swipe_up_gesture_tutorial_shape"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="?attr/surfaceHome" />