Merge "Update the gesture nav tutorial to use a mock transient taskbar" into tm-qpr-dev (2980adb2) · Commits · e / os / BlissLauncher3

quickstep/res/drawable/mock_app_icon.xml

0 → 100644

+21 −0

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="rectangle">
		<solid android:color="@color/mock_app_icon" />
		<corners android:radius="@dimen/gesture_tutorial_taskbar_icon_corner_radius" />
		</shape>
		No newline at end of file

quickstep/res/drawable/mock_taskbar_background.xml

0 → 100644

+21 −0

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="rectangle">
		<solid android:color="@color/gesture_tutorial_taskbar_color" />
		<corners android:radius="@dimen/gesture_tutorial_taskbar_corner_radius" />
		</shape>
		No newline at end of file

quickstep/res/layout-land/gesture_tutorial_mock_hotseat.xml

+4 −4

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius"
		app:cardBackgroundColor="@color/mock_app_icon_1"
		app:cardBackgroundColor="@color/mock_app_icon"
		app:layout_constraintDimensionRatio="1:1"
		app:layout_constraintVertical_chainStyle="spread_inside"
		app:layout_constraintTop_toTopOf="parent"
		@@ -45,7 +45,7 @@

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius"
		app:cardBackgroundColor="@color/mock_app_icon_2"
		app:cardBackgroundColor="@color/mock_app_icon"
		app:layout_constraintDimensionRatio="1:1"
		app:layout_constraintTop_toBottomOf="@id/hotseat_icon_1"
		app:layout_constraintBottom_toTopOf="@id/hotseat_icon_3"
		@@ -58,7 +58,7 @@

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius"
		app:cardBackgroundColor="@color/mock_app_icon_3"
		app:cardBackgroundColor="@color/mock_app_icon"
		app:layout_constraintDimensionRatio="1:1"
		app:layout_constraintTop_toBottomOf="@id/hotseat_icon_2"
		app:layout_constraintBottom_toTopOf="@id/hotseat_icon_4"
		@@ -71,7 +71,7 @@

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius"
		app:cardBackgroundColor="@color/mock_app_icon_4"
		app:cardBackgroundColor="@color/mock_app_icon"
		app:layout_constraintDimensionRatio="1:1"
		app:layout_constraintTop_toBottomOf="@id/hotseat_icon_3"
		app:layout_constraintBottom_toBottomOf="parent"

quickstep/res/layout-land/gesture_tutorial_tablet_mock_hotseat.xml

+5 −19

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius"
		app:cardBackgroundColor="@color/mock_app_icon_1"
		app:cardBackgroundColor="@color/mock_app_icon"
		app:layout_constraintDimensionRatio="1:1"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		@@ -57,7 +57,7 @@

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius"
		app:cardBackgroundColor="@color/mock_app_icon_2"
		app:cardBackgroundColor="@color/mock_app_icon"
		app:layout_constraintDimensionRatio="1:1"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		@@ -71,7 +71,7 @@

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius"
		app:cardBackgroundColor="@color/mock_app_icon_3"
		app:cardBackgroundColor="@color/mock_app_icon"
		app:layout_constraintDimensionRatio="1:1"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		@@ -85,7 +85,7 @@

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius"
		app:cardBackgroundColor="@color/mock_app_icon_1"
		app:cardBackgroundColor="@color/mock_app_icon"
		app:layout_constraintDimensionRatio="1:1"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		@@ -99,25 +99,11 @@

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius"
		app:cardBackgroundColor="@color/mock_app_icon_4"
		app:cardBackgroundColor="@color/mock_app_icon"
		app:layout_constraintDimensionRatio="1:1"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toEndOf="@id/hotseat_icon_4"
		app:layout_constraintEnd_toStartOf="@id/hotseat_icon_6"/>

		<androidx.cardview.widget.CardView
		android:id="@+id/hotseat_icon_6"
		android:layout_width="@dimen/gesture_tutorial_hotseat_icon_size"
		android:layout_height="@dimen/gesture_tutorial_hotseat_icon_size"

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius"
		app:cardBackgroundColor="@color/mock_app_icon_2"
		app:layout_constraintDimensionRatio="1:1"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toEndOf="@id/hotseat_icon_5"
		app:layout_constraintEnd_toEndOf="parent"/>

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

quickstep/res/layout/gesture_tutorial_foldable_mock_hotseat.xml

+5 −19

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius"
		app:cardBackgroundColor="@color/mock_app_icon_1"
		app:cardBackgroundColor="@color/mock_app_icon"
		app:layout_constraintDimensionRatio="1:1"
		app:layout_constraintHorizontal_chainStyle="spread_inside"
		app:layout_constraintTop_toBottomOf="@id/hotseat_search_bar"
		@@ -57,7 +57,7 @@

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius"
		app:cardBackgroundColor="@color/mock_app_icon_2"
		app:cardBackgroundColor="@color/mock_app_icon"
		app:layout_constraintDimensionRatio="1:1"
		app:layout_constraintTop_toBottomOf="@id/hotseat_search_bar"
		app:layout_constraintStart_toEndOf="@id/hotseat_icon_1"
		@@ -71,7 +71,7 @@

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius"
		app:cardBackgroundColor="@color/mock_app_icon_3"
		app:cardBackgroundColor="@color/mock_app_icon"
		app:layout_constraintDimensionRatio="1:1"
		app:layout_constraintTop_toBottomOf="@id/hotseat_search_bar"
		app:layout_constraintStart_toEndOf="@id/hotseat_icon_2"
		@@ -85,7 +85,7 @@

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius"
		app:cardBackgroundColor="@color/mock_app_icon_1"
		app:cardBackgroundColor="@color/mock_app_icon"
		app:layout_constraintDimensionRatio="1:1"
		app:layout_constraintTop_toBottomOf="@id/hotseat_search_bar"
		app:layout_constraintStart_toEndOf="@id/hotseat_icon_3"
		@@ -99,24 +99,10 @@

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius"
		app:cardBackgroundColor="@color/mock_app_icon_4"
		app:cardBackgroundColor="@color/mock_app_icon"
		app:layout_constraintDimensionRatio="1:1"
		app:layout_constraintTop_toBottomOf="@id/hotseat_search_bar"
		app:layout_constraintStart_toEndOf="@id/hotseat_icon_4"
		app:layout_constraintEnd_toStartOf="@id/hotseat_icon_6"/>

		<androidx.cardview.widget.CardView
		android:id="@+id/hotseat_icon_6"
		android:layout_width="@dimen/gesture_tutorial_hotseat_icon_size"
		android:layout_height="@dimen/gesture_tutorial_hotseat_icon_size"
		android:layout_marginTop="@dimen/gesture_tutorial_hotseat_icon_search_margin"

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_icon_corner_radius"
		app:cardBackgroundColor="@color/mock_app_icon_2"
		app:layout_constraintDimensionRatio="1:1"
		app:layout_constraintTop_toBottomOf="@id/hotseat_search_bar"
		app:layout_constraintStart_toEndOf="@id/hotseat_icon_5"
		app:layout_constraintEnd_toEndOf="parent"/>

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