Merge "Update gesture navigation tutorial with new specs for foldable devices." into sc-v2-dev (b4307ff8) · Commits · e / os / BlissLauncher3

quickstep/res/drawable/default_sandbox_mock_launcher.xml

deleted100644 → 0

+0 −21

Original line number	Original line	Diff line number	Diff line
	<vector xmlns:android="http://schemas.android.com/apk/res/android"
	android:width="360dp"
	android:height="146dp"
	android:viewportWidth="360"
	android:viewportHeight="146">
	<path
	android:pathData="M25,96L335,96A25,25 0,0 1,360 121L360,121A25,25 0,0 1,335 146L25,146A25,25 0,0 1,0 121L0,121A25,25 0,0 1,25 96z"
	android:fillColor="#3C4043"/>
	<path
	android:pathData="M30,30m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
	android:fillColor="#8AB4F8"/>
	<path
	android:pathData="M130,30m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
	android:fillColor="#F28B82"/>
	<path
	android:pathData="M230,30m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
	android:fillColor="#FDD663"/>
	<path
	android:pathData="M330,30m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
	android:fillColor="#81C995"/>
	</vector>

quickstep/res/layout/gesture_tutorial_foldable_mock_conversation.xml

0 → 100644

+239 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!-- Copyright (C) 2021 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.
			-->
			<androidx.constraintlayout.widget.ConstraintLayout
			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="match_parent">

			<androidx.constraintlayout.widget.ConstraintLayout
			android:id="@+id/top_bar"
			android:layout_width="match_parent"
			android:layout_height="101dp"
			android:background="@color/mock_conversation_top_bar"

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

			<androidx.cardview.widget.CardView
			android:layout_width="0dp"
			android:layout_height="0dp"
			android:layout_marginTop="43dp"
			android:layout_marginBottom="22dp"
			android:layout_marginStart="126dp"
			android:layout_marginEnd="548dp"

			app:cardElevation="0dp"
			app:cardCornerRadius="4dp"
			app:cardBackgroundColor="@color/mock_conversation_top_bar_item"
			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:layout_width="0dp"
			android:layout_height="0dp"
			android:layout_marginTop="43dp"
			android:layout_marginBottom="22dp"
			android:layout_marginStart="300dp"
			android:layout_marginEnd="16dp"

			app:cardElevation="0dp"
			app:cardCornerRadius="4dp"
			app:cardBackgroundColor="@color/mock_conversation_top_bar_item"
			app:layout_constraintDimensionRatio="1:1"
			app:layout_constraintTop_toTopOf="parent"
			app:layout_constraintBottom_toBottomOf="parent"
			app:layout_constraintEnd_toStartOf="@id/top_bar_button"/>

			<androidx.cardview.widget.CardView
			android:id="@+id/top_bar_button"
			android:layout_width="0dp"
			android:layout_height="0dp"
			android:layout_marginTop="43dp"
			android:layout_marginBottom="22dp"
			android:layout_marginStart="300dp"
			android:layout_marginEnd="126dp"

			app:cardElevation="0dp"
			app:cardCornerRadius="4dp"
			app:cardBackgroundColor="@color/mock_conversation_top_bar_item"
			app:layout_constraintDimensionRatio="1:1"
			app:layout_constraintTop_toTopOf="parent"
			app:layout_constraintBottom_toBottomOf="parent"
			app:layout_constraintEnd_toEndOf="parent"/>

			</androidx.constraintlayout.widget.ConstraintLayout>

			<androidx.constraintlayout.widget.ConstraintLayout
			android:layout_width="match_parent"
			android:layout_height="0dp"
			android:background="@color/mock_conversation_background"
			android:paddingBottom="80dp"

			app:layout_constraintTop_toBottomOf="@id/top_bar"
			app:layout_constraintBottom_toBottomOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintEnd_toEndOf="parent">

			<androidx.constraintlayout.widget.ConstraintLayout
			android:layout_width="match_parent"
			android:layout_height="0dp"
			android:paddingBottom="@dimen/gesture_tutorial_message_input_margin_top"

			app:layout_constraintTop_toTopOf="parent"
			app:layout_constraintBottom_toTopOf="@id/message_bar"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintEnd_toEndOf="parent">

			<androidx.cardview.widget.CardView
			android:id="@+id/message_1"
			android:layout_width="0dp"
			android:layout_height="112dp"
			android:layout_marginBottom="@dimen/gesture_tutorial_message_large_margin_bottom"
			android:layout_marginStart="445dp"
			android:layout_marginEnd="@dimen/gesture_tutorial_foldable_message_padding_start_end"

			app:cardElevation="0dp"
			app:cardCornerRadius="18dp"
			app:cardBackgroundColor="@color/mock_conversation_sent_message"
			app:layout_constraintBottom_toTopOf="@id/reply_icon_1"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintEnd_toEndOf="parent"/>

			<androidx.cardview.widget.CardView
			android:id="@+id/reply_icon_1"
			android:layout_width="@dimen/gesture_tutorial_message_icon_size"
			android:layout_height="@dimen/gesture_tutorial_message_icon_size"
			android:layout_marginBottom="@dimen/gesture_tutorial_message_large_margin_bottom"
			android:layout_marginStart="@dimen/gesture_tutorial_foldable_message_padding_start_end"

			app:cardElevation="0dp"
			app:cardCornerRadius="@dimen/gesture_tutorial_message_icon_corner_radius"
			app:cardBackgroundColor="@color/mock_conversation_profile_icon"
			app:layout_constraintDimensionRatio="1:1"
			app:layout_constraintBottom_toTopOf="@id/message_2"
			app:layout_constraintStart_toStartOf="parent"/>

			<androidx.cardview.widget.CardView
			android:layout_width="0dp"
			android:layout_height="36dp"
			android:layout_marginStart="17dp"
			android:layout_marginEnd="441dp"

			app:cardElevation="0dp"
			app:cardCornerRadius="18dp"
			app:cardBackgroundColor="@color/mock_conversation_received_message"
			app:layout_constraintTop_toTopOf="@id/reply_icon_1"
			app:layout_constraintBottom_toBottomOf="@id/reply_icon_1"
			app:layout_constraintStart_toEndOf="@id/reply_icon_1"
			app:layout_constraintEnd_toEndOf="parent"/>

			<androidx.cardview.widget.CardView
			android:id="@+id/message_2"
			android:layout_width="0dp"
			android:layout_height="36dp"
			android:layout_marginBottom="@dimen/gesture_tutorial_message_small_margin_bottom"
			android:layout_marginStart="601dp"
			android:layout_marginEnd="@dimen/gesture_tutorial_foldable_message_padding_start_end"

			app:cardElevation="0dp"
			app:cardCornerRadius="18dp"
			app:cardBackgroundColor="@color/mock_conversation_sent_message"
			app:layout_constraintBottom_toTopOf="@id/message_3"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintEnd_toEndOf="parent"/>

			<androidx.cardview.widget.CardView
			android:id="@+id/message_3"
			android:layout_width="0dp"
			android:layout_height="74dp"
			android:layout_marginBottom="@dimen/gesture_tutorial_message_large_margin_bottom"
			android:layout_marginStart="445dp"
			android:layout_marginEnd="@dimen/gesture_tutorial_foldable_message_padding_start_end"

			app:cardElevation="0dp"
			app:cardCornerRadius="18dp"
			app:cardBackgroundColor="@color/mock_conversation_sent_message"
			app:layout_constraintBottom_toTopOf="@id/reply_icon_2"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintEnd_toEndOf="parent"/>

			<androidx.cardview.widget.CardView
			android:id="@+id/reply_icon_2"
			android:layout_width="@dimen/gesture_tutorial_message_icon_size"
			android:layout_height="@dimen/gesture_tutorial_message_icon_size"
			android:layout_marginBottom="32dp"
			android:layout_marginStart="@dimen/gesture_tutorial_foldable_message_padding_start_end"

			app:cardElevation="0dp"
			app:cardCornerRadius="@dimen/gesture_tutorial_message_icon_corner_radius"
			app:cardBackgroundColor="@color/mock_conversation_profile_icon"
			app:layout_constraintDimensionRatio="1:1"
			app:layout_constraintBottom_toTopOf="@id/message_4"
			app:layout_constraintStart_toStartOf="parent"/>

			<androidx.cardview.widget.CardView
			android:layout_width="0dp"
			android:layout_height="36dp"
			android:layout_marginStart="17dp"
			android:layout_marginEnd="473dp"

			app:cardElevation="0dp"
			app:cardCornerRadius="18dp"
			app:cardBackgroundColor="@color/mock_conversation_received_message"
			app:layout_constraintTop_toTopOf="@id/reply_icon_2"
			app:layout_constraintBottom_toBottomOf="@id/reply_icon_2"
			app:layout_constraintStart_toEndOf="@id/reply_icon_2"
			app:layout_constraintEnd_toEndOf="parent"/>

			<androidx.cardview.widget.CardView
			android:id="@+id/message_4"
			android:layout_width="0dp"
			android:layout_height="74dp"
			android:layout_marginStart="445dp"
			android:layout_marginEnd="@dimen/gesture_tutorial_foldable_message_padding_start_end"

			app:cardElevation="0dp"
			app:cardCornerRadius="18dp"
			app:cardBackgroundColor="@color/mock_conversation_sent_message"
			app:layout_constraintBottom_toBottomOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintEnd_toEndOf="parent"/>

			</androidx.constraintlayout.widget.ConstraintLayout>

			<androidx.cardview.widget.CardView
			android:id="@+id/message_bar"
			android:layout_width="0dp"
			android:layout_height="44dp"
			android:layout_marginTop="36dp"
			android:layout_marginBottom="24dp"
			android:layout_marginStart="134dp"
			android:layout_marginEnd="126dp"

			app:cardElevation="0dp"
			app:cardCornerRadius="164dp"
			app:cardBackgroundColor="@color/mock_conversation_message_input"
			app:layout_constraintBottom_toBottomOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintEnd_toEndOf="parent" />

			</androidx.constraintlayout.widget.ConstraintLayout>

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

quickstep/res/layout/gesture_tutorial_foldable_mock_conversation_list.xml

0 → 100644

+396 −0

File added.

Preview size limit exceeded, changes collapsed.

quickstep/res/layout/gesture_tutorial_foldable_mock_hotseat.xml

0 → 100644

+108 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<androidx.constraintlayout.widget.ConstraintLayout
			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="wrap_content"
			android:paddingBottom="32dp"
			android:paddingStart="170dp"
			android:paddingEnd="170dp">

			<androidx.cardview.widget.CardView
			android:id="@+id/hotseat_search_bar"
			android:layout_width="0dp"
			android:layout_height="@dimen/gesture_tutorial_hotseat_search_height"

			app:cardElevation="0dp"
			app:cardCornerRadius="@dimen/gesture_tutorial_hotseat_search_corner_radius"
			app:cardBackgroundColor="@color/mock_search_bar"
			app:layout_constraintTop_toTopOf="parent"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintEnd_toEndOf="parent"/>

			<androidx.cardview.widget.CardView
			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: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_1"
			app:layout_constraintDimensionRatio="1:1"
			app:layout_constraintHorizontal_chainStyle="spread_inside"
			app:layout_constraintTop_toBottomOf="@id/hotseat_search_bar"
			app:layout_constraintStart_toStartOf="parent"
			app:layout_constraintEnd_toStartOf="@id/hotseat_icon_2"/>

			<androidx.cardview.widget.CardView
			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: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_1"
			app:layout_constraintEnd_toStartOf="@id/hotseat_icon_3"/>

			<androidx.cardview.widget.CardView
			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: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_3"
			app:layout_constraintDimensionRatio="1:1"
			app:layout_constraintTop_toBottomOf="@id/hotseat_search_bar"
			app:layout_constraintStart_toEndOf="@id/hotseat_icon_2"
			app:layout_constraintEnd_toStartOf="@id/hotseat_icon_4"/>

			<androidx.cardview.widget.CardView
			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: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_1"
			app:layout_constraintDimensionRatio="1:1"
			app:layout_constraintTop_toBottomOf="@id/hotseat_search_bar"
			app:layout_constraintStart_toEndOf="@id/hotseat_icon_3"
			app:layout_constraintEnd_toStartOf="@id/hotseat_icon_5"/>

			<androidx.cardview.widget.CardView
			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: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_4"
			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

quickstep/res/layout/gesture_tutorial_foldable_mock_webpage.xml

0 → 100644

+275 −0

File added.

Preview size limit exceeded, changes collapsed.