Merge "Add mock animated taskbar to gesture nav tutorial for foldable devices." into sc-v2-dev (3edb8de0) · Commits · e / os / BlissLauncher3

quickstep/res/layout/gesture_tutorial_foldable_mock_conversation.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:background="@color/mock_conversation_background"
		android:paddingBottom="80dp"
		android:paddingBottom="@dimen/gesture_tutorial_mock_taskbar_height"

		app:layout_constraintTop_toBottomOf="@id/top_bar"
		app:layout_constraintBottom_toBottomOf="parent"

quickstep/res/layout/gesture_tutorial_foldable_mock_conversation_list.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:background="@color/mock_list_background"
		android:paddingBottom="80dp"
		android:paddingBottom="@dimen/gesture_tutorial_mock_taskbar_height"

		app:layout_constraintTop_toBottomOf="@id/top_bar"
		app:layout_constraintBottom_toBottomOf="parent"

quickstep/res/layout/gesture_tutorial_foldable_mock_taskbar.xml

0 → 100644

+118 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<com.android.quickstep.interaction.AnimatedTaskbarView
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:layout_width="match_parent"
		android:layout_height="@dimen/gesture_tutorial_mock_taskbar_height">

		<View
		android:id="@+id/taskbar_background"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@color/gesture_tutorial_taskbar_color"

		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintEnd_toEndOf="parent"/>

		<androidx.constraintlayout.widget.ConstraintLayout
		android:id="@+id/icon_container"
		android:layout_width="match_parent"
		android:layout_height="match_parent"

		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintEnd_toEndOf="parent">

		<androidx.cardview.widget.CardView
		android:id="@+id/taskbar_icon_1"
		android:layout_width="@dimen/gesture_tutorial_taskbar_icon_size"
		android:layout_height="@dimen/gesture_tutorial_taskbar_icon_size"
		android:layout_marginStart="@dimen/gesture_tutorial_taskbar_padding_start_end"

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_taskbar_icon_corner_radius"
		app:cardBackgroundColor="@color/mock_app_icon_1"
		app:layout_constraintDimensionRatio="1:1"
		app:layout_constraintHorizontal_chainStyle="spread_inside"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintEnd_toStartOf="@id/taskbar_icon_2"/>

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

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_taskbar_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/taskbar_icon_1"
		app:layout_constraintEnd_toStartOf="@id/taskbar_icon_3"/>

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

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_taskbar_icon_corner_radius"
		app:cardBackgroundColor="@color/mock_app_icon_3"
		app:layout_constraintDimensionRatio="1:1"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toEndOf="@id/taskbar_icon_2"
		app:layout_constraintEnd_toStartOf="@id/taskbar_icon_4"/>

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

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_taskbar_icon_corner_radius"
		app:cardBackgroundColor="@color/mock_app_icon_1"
		app:layout_constraintDimensionRatio="1:1"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toEndOf="@id/taskbar_icon_3"
		app:layout_constraintEnd_toStartOf="@id/taskbar_icon_5"/>

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

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_taskbar_icon_corner_radius"
		app:cardBackgroundColor="@color/mock_app_icon_4"
		app:layout_constraintDimensionRatio="1:1"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toEndOf="@id/taskbar_icon_4"
		app:layout_constraintEnd_toStartOf="@id/taskbar_icon_6"/>

		<androidx.cardview.widget.CardView
		android:id="@+id/taskbar_icon_6"
		android:layout_width="@dimen/gesture_tutorial_taskbar_icon_size"
		android:layout_height="@dimen/gesture_tutorial_taskbar_icon_size"
		android:layout_marginEnd="@dimen/gesture_tutorial_taskbar_padding_start_end"

		app:cardElevation="0dp"
		app:cardCornerRadius="@dimen/gesture_tutorial_taskbar_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/taskbar_icon_5"
		app:layout_constraintEnd_toEndOf="parent"/>

		</androidx.constraintlayout.widget.ConstraintLayout>

		</com.android.quickstep.interaction.AnimatedTaskbarView>
		No newline at end of file

quickstep/res/layout/gesture_tutorial_fragment.xml

+9 −0

Original line number	Diff line number	Diff line
		@@ -101,6 +101,15 @@
		android:layout_height="match_parent"
		android:background="@drawable/gesture_tutorial_ripple"/>

		<include
		layout="@layout/gesture_tutorial_foldable_mock_taskbar"
		android:id="@+id/gesture_tutorial_fake_taskbar_view"
		android:layout_width="match_parent"
		android:layout_height="@dimen/gesture_tutorial_mock_taskbar_height"
		android:layout_alignParentBottom="true"
		android:layout_alignParentStart="true"
		android:layout_alignParentEnd="true" />

		<ImageView
		android:id="@+id/gesture_tutorial_edge_gesture_video"
		android:layout_width="match_parent"

quickstep/res/values/colors.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@
		<color name="gesture_tutorial_fake_previous_task_view_color">#3C4043</color> <!-- Gray -->
		<color name="gesture_tutorial_action_button_label_color">#FF000000</color>
		<color name="gesture_tutorial_primary_color">#B7F29F</color> <!-- Light Green -->
		<color name="gesture_tutorial_taskbar_color">#202124</color>

		<!-- Mock hotseat -->
		<color name="mock_app_icon_1">#8AB4F8</color>