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

Commit 9caa0f95 authored by Schneider Victor-tulias's avatar Schneider Victor-tulias
Browse files

Fix redesigned gesture nav jank 

- Removed the fake animated taskbar view from the redesigned tutorial flow
- Fixed the hotseat and home icon colors from the overview step

Flag: ENABLE_NEW_GESTURE_NAV_TUTORIAL
Bug: 279823249
Fixes: 281121701
Fixes: 283310758
Test: swiped up from home/overview step
Change-Id: Ie659495994f0c935c5b6c6bf1ae534ec51521726
parent 0a6fb2c9

quickstep/res/drawable/redesigned_default_sandbox_app_icon.xml

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

-->

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

    android:shape="oval">

    <solid android:color="?attr/surfaceHome" />

</shape>

quickstep/res/drawable/hotseat_icon_home.xml→quickstep/res/drawable/redesigned_hotseat_icon.xml

+0 −1
Original line number Diff line number Diff line
@@ -16,6 +16,5 @@ 
<shape

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

    android:shape="rectangle">

    <solid android:color="?attr/surfaceHome" />

    <corners android:radius="@dimen/gesture_tutorial_hotseat_icon_corner_radius" />

</shape>
 
 No newline at end of file

quickstep/res/layout-land/redesigned_gesture_tutorial_mock_hotseat.xml

+4 −4
Original line number Diff line number Diff line
@@ -40,28 +40,28 @@ 
        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:background="@drawable/redesigned_hotseat_icon"

        android:clipToOutline="true" />



    <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:background="@drawable/redesigned_hotseat_icon"

        android:clipToOutline="true" />



    <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:background="@drawable/redesigned_hotseat_icon"

        android:clipToOutline="true" />



    <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:background="@drawable/redesigned_hotseat_icon"

        android:clipToOutline="true" />



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

quickstep/res/layout-land/redesigned_gesture_tutorial_tablet_mock_hotseat.xml

+6 −6
Original line number Diff line number Diff line
@@ -39,42 +39,42 @@ 
        android:id="@+id/hotseat_search_bar"

        android:layout_width="200dp"

        android:layout_height="@dimen/gesture_tutorial_hotseat_search_height"

        android:background="@drawable/hotseat_icon_home"

        android:background="@drawable/redesigned_hotseat_icon"

        android:clipToOutline="true" />



    <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:background="@drawable/redesigned_hotseat_icon"

        android:clipToOutline="true" />



    <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:background="@drawable/redesigned_hotseat_icon"

        android:clipToOutline="true" />



    <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:background="@drawable/redesigned_hotseat_icon"

        android:clipToOutline="true" />



    <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:background="@drawable/redesigned_hotseat_icon"

        android:clipToOutline="true" />



    <View

        android:id="@+id/hotseat_icon_5"

        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:background="@drawable/redesigned_hotseat_icon"

        android:clipToOutline="true" />



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

quickstep/res/layout/redesigned_gesture_tutorial_foldable_mock_hotseat.xml

+6 −6
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
        android:id="@+id/hotseat_search_bar"

        android:layout_width="0dp"

        android:layout_height="@dimen/gesture_tutorial_hotseat_search_height"

        android:background="@drawable/hotseat_icon_home"

        android:background="@drawable/redesigned_hotseat_icon"

        android:clipToOutline="true"



        app:layout_constraintTop_toTopOf="parent"
@@ -50,35 +50,35 @@ 
        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:background="@drawable/redesigned_hotseat_icon"

        android:clipToOutline="true" />



    <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:background="@drawable/redesigned_hotseat_icon"

        android:clipToOutline="true" />



    <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:background="@drawable/redesigned_hotseat_icon"

        android:clipToOutline="true" />



    <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:background="@drawable/redesigned_hotseat_icon"

        android:clipToOutline="true" />



    <View

        android:id="@+id/hotseat_icon_5"

        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:background="@drawable/redesigned_hotseat_icon"

        android:clipToOutline="true" />



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