From 5feb491549670df184af9638db3fe02059e81fe5 Mon Sep 17 00:00:00 2001 From: Saumya Prakash Date: Mon, 20 Nov 2023 22:57:13 +0000 Subject: [PATCH] Add taskbar pinning education for new users and update other steps This change updates the current transient taskbar education to include the pinning feature and additional updates to Lottie animations. It also removes the tutorial that teaches users to switch navigation modes. The pinning education is gated behind an additional pinning education static flag. Fixes: 302588455,300161174 Test: Went through taskbar education for persistent and transient taskbar with the flag on and off. Flag: ACONFIG com.android.launcher3.enable_taskbar_pinning DISABLED Change-Id: I836467091bfe694eee89ac46c4be597c490e1b3f --- quickstep/res/layout/taskbar_edu_features.xml | 26 +++++++++---------- quickstep/res/raw/taskbar_edu_pinning.json | 1 + .../taskbar_edu_splitscreen_persistent.json | 2 +- .../taskbar_edu_splitscreen_transient.json | 2 +- quickstep/res/raw/taskbar_edu_stashing.json | 2 +- .../taskbar_edu_suggestions_persistent.json | 2 +- .../taskbar_edu_suggestions_transient.json | 2 +- quickstep/res/values/dimens.xml | 4 +-- quickstep/res/values/strings.xml | 4 +-- .../taskbar/TaskbarEduTooltipController.kt | 25 +++++++++++------- .../launcher3/config/FeatureFlags.java | 8 ++++++ .../android/launcher3/util/OnboardingPrefs.kt | 2 +- 12 files changed, 48 insertions(+), 32 deletions(-) create mode 100644 quickstep/res/raw/taskbar_edu_pinning.json diff --git a/quickstep/res/layout/taskbar_edu_features.xml b/quickstep/res/layout/taskbar_edu_features.xml index efbe7f82fe..15de74c692 100644 --- a/quickstep/res/layout/taskbar_edu_features.xml +++ b/quickstep/res/layout/taskbar_edu_features.xml @@ -51,40 +51,40 @@ android:layout_height="wrap_content" android:text="@string/taskbar_edu_splitscreen" - app:layout_constraintEnd_toStartOf="@id/settings_text" + app:layout_constraintEnd_toStartOf="@id/pinning_text" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/splitscreen_animation" /> + app:constraint_referenced_ids="pinning_animation,pinning_text" /> + app:layout_constraintEnd_toStartOf="@id/suggestions_text" + app:layout_constraintTop_toBottomOf="@id/pinning_animation" /> + app:constraint_referenced_ids="splitscreen_text,pinning_text,suggestions_text" />