aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 19:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes Iaf02a42a,I8daf3c08 into tm-qpr-dev am: 1a4eb297ee

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21161656

Change-Id: Ifa1ade1b50a767bdb4385c283848f6269b51d71b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brian Isganitis
2023-02-01 02:10:03 +00:00
committed by Automerger Merge Worker
parent a2edf995e1 1a4eb297ee
commit 69fcae1207
5 changed files with 52 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
quickstep/res/layout/taskbar_edu_features.xml
View File

@@ -23,8 +23,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/taskbar_edu_features"
app:layout_constraintEnd_toEndOf="@id/suggestions_animation"
app:layout_constraintStart_toStartOf="@id/splitscreen_animation"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.airbnb.lottie.LottieAnimationView
@@ -49,6 +49,35 @@
app:layout_constraintStart_toStartOf="@id/splitscreen_animation"
app:layout_constraintTop_toBottomOf="@id/splitscreen_animation" />
<androidx.constraintlayout.widget.Group
android:id="@+id/settings_edu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="settings_animation,settings_text" />
<com.airbnb.lottie.LottieAnimationView
android:id="@+id/settings_animation"
android:layout_width="@dimen/taskbar_edu_features_lottie_width"
android:layout_height="@dimen/taskbar_edu_features_lottie_height"
android:layout_marginStart="@dimen/taskbar_edu_features_horizontal_spacing"
android:layout_marginTop="@dimen/taskbar_edu_tooltip_vertical_margin"
android:scaleType="centerCrop"
app:layout_constraintStart_toEndOf="@id/splitscreen_animation"
app:layout_constraintTop_toBottomOf="@id/title"
app:lottie_autoPlay="true"
app:lottie_loop="true"
app:lottie_rawRes="@raw/taskbar_edu_settings" />
<TextView
android:id="@+id/settings_text"
style="@style/TextAppearance.TaskbarEduTooltip.Subtext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/taskbar_edu_settings_persistent"
app:layout_constraintEnd_toEndOf="@id/settings_animation"
app:layout_constraintStart_toStartOf="@id/settings_animation"
app:layout_constraintTop_toBottomOf="@id/settings_animation" />
<com.airbnb.lottie.LottieAnimationView
android:id="@+id/suggestions_animation"
android:layout_width="@dimen/taskbar_edu_features_lottie_width"
@@ -57,7 +86,7 @@
android:layout_marginTop="@dimen/taskbar_edu_tooltip_vertical_margin"
android:scaleType="centerCrop"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/splitscreen_animation"
app:layout_constraintStart_toEndOf="@id/settings_animation"
app:layout_constraintTop_toBottomOf="@id/title"
app:lottie_autoPlay="true"
app:lottie_loop="true"
@@ -73,6 +102,13 @@
app:layout_constraintStart_toStartOf="@id/suggestions_animation"
app:layout_constraintTop_toBottomOf="@id/suggestions_animation" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/edu_barrier_bottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="splitscreen_text,settings_text,suggestions_text" />
<Button
android:id="@+id/done_button"
style="@style/TaskbarEdu.Button.Next"
@@ -83,5 +119,5 @@
android:textColor="?androidprv:attr/textColorOnAccent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/suggestions_text" />
app:layout_constraintTop_toBottomOf="@id/edu_barrier_bottom" />
</merge>

1
quickstep/res/raw/taskbar_edu_settings.json Normal file
View File

File diff suppressed because one or more lines are too long

4
quickstep/res/values/strings.xml
View File

@@ -240,9 +240,11 @@
<!-- Text in dialog that lets a user know how they can use the Taskbar to use multiple apps at once on their device. [CHAR_LIMIT=60] -->
<string name="taskbar_edu_splitscreen">Drag an app to the side to use 2 apps at once</string>
<!-- Text in dialog that lets a user know how they can show the Taskbar on their device. [CHAR_LIMIT=60] -->
<string name="taskbar_edu_stashing">Slow swipe up to show the Taskbar</string>
<string name="taskbar_edu_stashing">Slow-swipe up to show the Taskbar</string>
<!-- Text in dialog that lets a user know how the Taskbar suggests apps based on their usage. [CHAR_LIMIT=60] -->
<string name="taskbar_edu_suggestions">Get app suggestions based on your routine</string>
<!-- Text in dialog that lets a user know that Taskbar will auto-hide, if the user switches to gesture navigation in system settings. [CHAR_LIMIT=90] -->
<string name="taskbar_edu_settings_persistent">Turn on gesture navigation in Settings to auto-hide the Taskbar</string>
<!-- Title in dialog that shows a user what they can do with the Taskbar. [CHAR_LIMIT=60] -->
<string name="taskbar_edu_features">Do more with the Taskbar</string>
<!-- Text on button to go to the next screen of a tutorial [CHAR_LIMIT=16] -->

9
quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltipController.kt
View File

@@ -18,6 +18,8 @@ package com.android.launcher3.taskbar
import android.graphics.PorterDuff.Mode.SRC_ATOP
import android.graphics.PorterDuffColorFilter
import android.view.View
import android.view.View.GONE
import android.view.View.VISIBLE
import android.view.ViewGroup
import androidx.annotation.IntDef
import androidx.annotation.LayoutRes
@@ -88,7 +90,7 @@ class TaskbarEduTooltipController(val activityContext: TaskbarActivityContext) :
tooltipStep = TOOLTIP_STEP_FEATURES
inflateTooltip(R.layout.taskbar_edu_swipe)
tooltip?.apply {
tooltip?.run {
findViewById<LottieAnimationView>(R.id.swipe_animation).supportLightTheme()
show()
}
@@ -107,9 +109,12 @@ class TaskbarEduTooltipController(val activityContext: TaskbarActivityContext) :
tooltipStep = TOOLTIP_STEP_NONE
inflateTooltip(R.layout.taskbar_edu_features)
tooltip?.apply {
tooltip?.run {
findViewById<LottieAnimationView>(R.id.splitscreen_animation).supportLightTheme()
findViewById<LottieAnimationView>(R.id.suggestions_animation).supportLightTheme()
findViewById<LottieAnimationView>(R.id.settings_animation).supportLightTheme()
findViewById<View>(R.id.settings_edu).visibility =
if (DisplayController.isTransientTaskbar(activityContext)) GONE else VISIBLE
findViewById<View>(R.id.done_button)?.setOnClickListener { hide() }
if (DisplayController.isTransientTaskbar(activityContext)) {

2
src/com/android/launcher3/config/FeatureFlags.java
View File

@@ -382,7 +382,7 @@ public final class FeatureFlags {
);
public static final BooleanFlag ENABLE_TASKBAR_EDU_TOOLTIP = getDebugFlag(
"ENABLE_TASKBAR_EDU_TOOLTIP", false,
"ENABLE_TASKBAR_EDU_TOOLTIP", true,
"Enable the tooltip version of the Taskbar education flow.");
public static final BooleanFlag ENABLE_MULTI_INSTANCE = getDebugFlag(