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

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
5 changed files with 52 additions and 8 deletions

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)) {