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

Commit a184e0de authored by Saumya Prakash's avatar Saumya Prakash Committed by Android (Google) Code Review
Browse files

Merge "Migrate from using CardViews to Views in gesture nav tutorial layouts." into tm-qpr-dev

parents 00cbb5e6 c65f37e7

quickstep/res/drawable/hotseat_icon.xml

0 → 100644
+21 −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.

-->

<shape

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

    android:shape="rectangle">

    <solid android:color="@color/mock_app_icon" />

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

</shape>
 
 No newline at end of file

quickstep/res/drawable/hotseat_icon_home.xml

0 → 100644
+21 −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.

-->

<shape

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

    android:shape="rectangle">

    <solid android:color="@color/gesture_home_tutorial_background" />

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

</shape>
 
 No newline at end of file

quickstep/res/drawable/hotseat_search_bar.xml

0 → 100644
+21 −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.

-->

<shape

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

    android:shape="rectangle">

    <solid android:color="@color/mock_search_bar" />

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

</shape>
 
 No newline at end of file

quickstep/res/drawable/top_task_view.xml

0 → 100644
+21 −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.

-->

<shape

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

    android:shape="rectangle">

    <solid android:color="@color/gesture_tutorial_fake_previous_task_view_color" />

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

</shape>
 
 No newline at end of file

quickstep/res/layout-land/gesture_tutorial_mock_hotseat.xml

+12 −16
Original line number Original line Diff line number Diff line
@@ -24,54 +24,50 @@ 
    android:paddingStart="56dp"

    android:paddingStart="56dp"

    android:paddingEnd="56dp">

    android:paddingEnd="56dp">





    <androidx.cardview.widget.CardView

    <View

        android:id="@+id/hotseat_icon_1"

        android:id="@+id/hotseat_icon_1"

        android:layout_width="@dimen/gesture_tutorial_hotseat_icon_size"

        android:layout_width="@dimen/gesture_tutorial_hotseat_icon_size"

        android:layout_height="@dimen/gesture_tutorial_hotseat_icon_size"

        android:layout_height="@dimen/gesture_tutorial_hotseat_icon_size"

        android:background="@drawable/hotseat_icon"

        android:clipToOutline="true"





        app:cardElevation="0dp"

        app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius"

        app:cardBackgroundColor="@color/mock_app_icon"

        app:layout_constraintDimensionRatio="1:1"

        app:layout_constraintDimensionRatio="1:1"

        app:layout_constraintVertical_chainStyle="spread_inside"

        app:layout_constraintVertical_chainStyle="spread_inside"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toTopOf="@id/hotseat_icon_2"

        app:layout_constraintBottom_toTopOf="@id/hotseat_icon_2"

        app:layout_constraintStart_toStartOf="parent"/>

        app:layout_constraintStart_toStartOf="parent"/>





    <androidx.cardview.widget.CardView

    <View

        android:id="@+id/hotseat_icon_2"

        android:id="@+id/hotseat_icon_2"

        android:layout_width="@dimen/gesture_tutorial_hotseat_icon_size"

        android:layout_width="@dimen/gesture_tutorial_hotseat_icon_size"

        android:layout_height="@dimen/gesture_tutorial_hotseat_icon_size"

        android:layout_height="@dimen/gesture_tutorial_hotseat_icon_size"

        android:background="@drawable/hotseat_icon"

        android:clipToOutline="true"





        app:cardElevation="0dp"

        app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius"

        app:cardBackgroundColor="@color/mock_app_icon"

        app:layout_constraintDimensionRatio="1:1"

        app:layout_constraintDimensionRatio="1:1"

        app:layout_constraintTop_toBottomOf="@id/hotseat_icon_1"

        app:layout_constraintTop_toBottomOf="@id/hotseat_icon_1"

        app:layout_constraintBottom_toTopOf="@id/hotseat_icon_3"

        app:layout_constraintBottom_toTopOf="@id/hotseat_icon_3"

        app:layout_constraintStart_toStartOf="parent"/>

        app:layout_constraintStart_toStartOf="parent"/>





    <androidx.cardview.widget.CardView

    <View

        android:id="@+id/hotseat_icon_3"

        android:id="@+id/hotseat_icon_3"

        android:layout_width="@dimen/gesture_tutorial_hotseat_icon_size"

        android:layout_width="@dimen/gesture_tutorial_hotseat_icon_size"

        android:layout_height="@dimen/gesture_tutorial_hotseat_icon_size"

        android:layout_height="@dimen/gesture_tutorial_hotseat_icon_size"

        android:background="@drawable/hotseat_icon"

        android:clipToOutline="true"





        app:cardElevation="0dp"

        app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius"

        app:cardBackgroundColor="@color/mock_app_icon"

        app:layout_constraintDimensionRatio="1:1"

        app:layout_constraintDimensionRatio="1:1"

        app:layout_constraintTop_toBottomOf="@id/hotseat_icon_2"

        app:layout_constraintTop_toBottomOf="@id/hotseat_icon_2"

        app:layout_constraintBottom_toTopOf="@id/hotseat_icon_4"

        app:layout_constraintBottom_toTopOf="@id/hotseat_icon_4"

        app:layout_constraintStart_toStartOf="parent"/>

        app:layout_constraintStart_toStartOf="parent"/>





    <androidx.cardview.widget.CardView

    <View

        android:id="@+id/hotseat_icon_4"

        android:id="@+id/hotseat_icon_4"

        android:layout_width="@dimen/gesture_tutorial_hotseat_icon_size"

        android:layout_width="@dimen/gesture_tutorial_hotseat_icon_size"

        android:layout_height="@dimen/gesture_tutorial_hotseat_icon_size"

        android:layout_height="@dimen/gesture_tutorial_hotseat_icon_size"

        android:background="@drawable/hotseat_icon"

        android:clipToOutline="true"





        app:cardElevation="0dp"

        app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius"

        app:cardBackgroundColor="@color/mock_app_icon"

        app:layout_constraintDimensionRatio="1:1"

        app:layout_constraintDimensionRatio="1:1"

        app:layout_constraintTop_toBottomOf="@id/hotseat_icon_3"

        app:layout_constraintTop_toBottomOf="@id/hotseat_icon_3"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"