mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-27 15:26:58 +00:00
Add Taskbar education for Circle to Search for pinned taskbar
This change adds a new education tooltip for pinned taskbar that teaches users how to use Circle to Search invoked through the action key. It won't run on transient taskbar or if the user is in 3 button mode. The disclosures at the bottom of the tooltip link to localized legal agreements for the feature. Fix: 330401405 Test: Pin the taskbar and observe that the next time an app is launched the edu shows up. After dismissal it shouldn't show up again. Additionally, click on the disclosures and ensure they launch. Flag: ACONFIG com.android.launcher3.enable_taskbar_pinning NEXTFOOD Change-Id: I64aea3004aca77c3ec81b81dea0cfab7a9c1e272
This commit is contained in:
57
quickstep/res/layout/taskbar_edu_circle_to_search.xml
Normal file
57
quickstep/res/layout/taskbar_edu_circle_to_search.xml
Normal file
@@ -0,0 +1,57 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2024 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="wrap_content"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
style="@style/TextAppearance.TaskbarEduTooltip.Title"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/taskbar_edu_circle_to_search_title"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toTopOf="@+id/circle_to_search_animation" />
|
||||
|
||||
<com.airbnb.lottie.LottieAnimationView
|
||||
android:id="@+id/circle_to_search_animation"
|
||||
android:layout_width="@dimen/taskbar_edu_swipe_lottie_width"
|
||||
android:layout_height="@dimen/taskbar_edu_swipe_lottie_height"
|
||||
android:layout_marginTop="@dimen/taskbar_edu_tooltip_vertical_margin"
|
||||
app:layout_constraintBottom_toTopOf="@id/circle_to_search_text"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/title"
|
||||
app:lottie_rawRes="@raw/taskbar_edu_circle_to_search"
|
||||
app:lottie_autoPlay="true"
|
||||
app:lottie_loop="true" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/circle_to_search_text"
|
||||
style="@style/TextAppearance.TaskbarEduTooltip.Subtext"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:textSize="@dimen/taskbar_edu_circle_to_search_subtitle_text_size"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/circle_to_search_animation"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
1
quickstep/res/raw/taskbar_edu_circle_to_search.json
Normal file
1
quickstep/res/raw/taskbar_edu_circle_to_search.json
Normal file
File diff suppressed because one or more lines are too long
@@ -397,6 +397,7 @@
|
||||
<dimen name="taskbar_edu_features_tooltip_width_with_one_feature">412dp</dimen>
|
||||
<dimen name="taskbar_edu_features_tooltip_width_with_two_features">428dp</dimen>
|
||||
<dimen name="taskbar_edu_features_tooltip_width_with_three_features">624dp</dimen>
|
||||
<dimen name="taskbar_edu_circle_to_search_subtitle_text_size">12sp</dimen>
|
||||
|
||||
<!--- Taskbar Pinning -->
|
||||
<dimen name="taskbar_pinning_popup_menu_width">300dp</dimen>
|
||||
|
||||
@@ -273,6 +273,10 @@
|
||||
<string name="taskbar_edu_pinning_title">Always show the Taskbar</string>
|
||||
<!-- Text in dialog that shows a user how to pin the Taskbar. [CHAR_LIMIT 150] -->
|
||||
<string name="taskbar_edu_pinning_standalone">To always show the Taskbar on the bottom of your screen, touch & hold the divider</string>
|
||||
<!-- Title in dialog that shows a user how to invoke the Circle to Search feature. [CHAR_LIMIT 150] -->
|
||||
<string name="taskbar_edu_circle_to_search_title">Touch & hold the action key to search what\'s on your screen</string>
|
||||
<!-- Message showed to user to disclose privacy information they need to accept in order to access the app. [CHAR LIMIT=200]-->
|
||||
<string name="taskbar_edu_circle_to_search_disclosure">This product uses the selected part of your screen to search. Google\'s <xliff:g example="https://policies.google.com/privacy/embedded" id="begin_privacy_link"><a href=\"%1$s\"></xliff:g>Privacy Policy<xliff:g id="end_privacy_link"></a></xliff:g> and <xliff:g example="https://policies.google.com/terms" id="begin_tos_link"><a href=\"%2$s\"></xliff:g>Terms of Service<xliff:g id="end_tos_link"></a></xliff:g> apply.</string>
|
||||
<!-- Text on button to exit a tutorial [CHAR_LIMIT=16] -->
|
||||
<string name="taskbar_edu_close">Close</string>
|
||||
<!-- Text on button to finish a tutorial [CHAR_LIMIT=16] -->
|
||||
|
||||
@@ -299,6 +299,8 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
|
||||
*/
|
||||
public void showEduOnAppLaunch() {
|
||||
if (!shouldShowEduOnAppLaunch()) {
|
||||
// Called in case the edu finishes and circle to search edu is still pending
|
||||
mControllers.taskbarEduTooltipController.maybeShowCircleToSearchEdu();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -15,7 +15,12 @@
|
||||
*/
|
||||
package com.android.launcher3.taskbar
|
||||
|
||||
import android.content.Intent
|
||||
import android.net.Uri
|
||||
import android.os.Bundle
|
||||
import android.text.SpannableString
|
||||
import android.text.method.LinkMovementMethod
|
||||
import android.text.style.URLSpan
|
||||
import android.view.Gravity
|
||||
import android.view.View
|
||||
import android.view.View.GONE
|
||||
@@ -24,16 +29,20 @@ import android.view.ViewGroup.LayoutParams.MATCH_PARENT
|
||||
import android.view.ViewGroup.MarginLayoutParams
|
||||
import android.view.accessibility.AccessibilityEvent
|
||||
import android.view.accessibility.AccessibilityNodeInfo
|
||||
import android.widget.TextView
|
||||
import androidx.annotation.IntDef
|
||||
import androidx.annotation.LayoutRes
|
||||
import androidx.core.text.HtmlCompat
|
||||
import androidx.core.view.updateLayoutParams
|
||||
import com.airbnb.lottie.LottieAnimationView
|
||||
import com.android.launcher3.LauncherPrefs
|
||||
import com.android.launcher3.R
|
||||
import com.android.launcher3.Utilities
|
||||
import com.android.launcher3.config.FeatureFlags.enableTaskbarPinning
|
||||
import com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_EDU_OPEN
|
||||
import com.android.launcher3.taskbar.TaskbarControllers.LoggableTaskbarController
|
||||
import com.android.launcher3.util.DisplayController
|
||||
import com.android.launcher3.util.OnboardingPrefs.TASKBAR_CIRCLE_TO_SEARCH_EDU_SEEN
|
||||
import com.android.launcher3.util.OnboardingPrefs.TASKBAR_EDU_TOOLTIP_STEP
|
||||
import com.android.launcher3.views.BaseDragLayer
|
||||
import com.android.quickstep.util.LottieAnimationColorUtils
|
||||
@@ -52,6 +61,10 @@ const val TOOLTIP_STEP_PINNING = 2
|
||||
* This value should match the maximum count for [TASKBAR_EDU_TOOLTIP_STEP].
|
||||
*/
|
||||
const val TOOLTIP_STEP_NONE = 3
|
||||
/** The base URL for the Privacy Policy that will later be localized. */
|
||||
private const val PRIVACY_POLICY_BASE_URL = "https://policies.google.com/privacy/embedded?hl="
|
||||
/** The base URL for the Terms of Service that will later be localized. */
|
||||
private const val TOS_BASE_URL = "https://policies.google.com/terms?hl="
|
||||
|
||||
/** Current step in the tooltip EDU flow. */
|
||||
@Retention(AnnotationRetention.SOURCE)
|
||||
@@ -70,6 +83,15 @@ class TaskbarEduTooltipController(val activityContext: TaskbarActivityContext) :
|
||||
get() = isTooltipEnabled && tooltipStep <= TOOLTIP_STEP_FEATURES
|
||||
private lateinit var controllers: TaskbarControllers
|
||||
|
||||
// Keep track of whether the user has seen the Circle to Search Edu
|
||||
private var userHasSeenCircleToSearchEdu: Boolean
|
||||
get() {
|
||||
return TASKBAR_CIRCLE_TO_SEARCH_EDU_SEEN.get(activityContext)
|
||||
}
|
||||
private set(seen) {
|
||||
LauncherPrefs.get(activityContext).put(TASKBAR_CIRCLE_TO_SEARCH_EDU_SEEN, seen)
|
||||
}
|
||||
|
||||
@TaskbarEduTooltipStep
|
||||
var tooltipStep: Int
|
||||
get() {
|
||||
@@ -83,6 +105,8 @@ class TaskbarEduTooltipController(val activityContext: TaskbarActivityContext) :
|
||||
|
||||
fun init(controllers: TaskbarControllers) {
|
||||
this.controllers = controllers
|
||||
// We want to show the Circle To Search Edu right after pinning, so we post it here
|
||||
activityContext.dragLayer.post { maybeShowCircleToSearchEdu() }
|
||||
}
|
||||
|
||||
/** Shows swipe EDU tooltip if it is the current [tooltipStep]. */
|
||||
@@ -112,6 +136,7 @@ class TaskbarEduTooltipController(val activityContext: TaskbarActivityContext) :
|
||||
fun maybeShowFeaturesEdu() {
|
||||
if (!isTooltipEnabled || tooltipStep > TOOLTIP_STEP_FEATURES) {
|
||||
maybeShowPinningEdu()
|
||||
maybeShowCircleToSearchEdu()
|
||||
return
|
||||
}
|
||||
|
||||
@@ -207,6 +232,96 @@ class TaskbarEduTooltipController(val activityContext: TaskbarActivityContext) :
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Shows standalone Circle To Search EDU tooltip if this EDU has not been seen.
|
||||
*
|
||||
* We show this standalone edu for users to learn to how to trigger Circle To Search from the
|
||||
* pinned taskbar
|
||||
*/
|
||||
fun maybeShowCircleToSearchEdu() {
|
||||
if (
|
||||
!enableTaskbarPinning() ||
|
||||
!DisplayController.isPinnedTaskbar(activityContext) ||
|
||||
!isTooltipEnabled ||
|
||||
userHasSeenCircleToSearchEdu
|
||||
) {
|
||||
return
|
||||
}
|
||||
userHasSeenCircleToSearchEdu = true
|
||||
inflateTooltip(R.layout.taskbar_edu_circle_to_search)
|
||||
tooltip?.run {
|
||||
requireViewById<LottieAnimationView>(R.id.circle_to_search_animation)
|
||||
.supportLightTheme()
|
||||
val eduSubtitle: TextView = requireViewById(R.id.circle_to_search_text)
|
||||
showDisclosureText(eduSubtitle)
|
||||
updateLayoutParams<BaseDragLayer.LayoutParams> {
|
||||
if (DisplayController.isTransientTaskbar(activityContext)) {
|
||||
bottomMargin += activityContext.deviceProfile.taskbarHeight
|
||||
}
|
||||
// Unlike other tooltips, we want to align with the all apps button rather than
|
||||
// center.
|
||||
gravity = Gravity.BOTTOM
|
||||
marginStart = 0
|
||||
width =
|
||||
resources.getDimensionPixelSize(
|
||||
R.dimen.taskbar_edu_features_tooltip_width_with_one_feature
|
||||
)
|
||||
}
|
||||
|
||||
// Calculate the amount the tooltip must be shifted by to align with the action key
|
||||
val allAppsButtonView = controllers.taskbarViewController.allAppsButtonView
|
||||
if (allAppsButtonView != null) {
|
||||
val allAppsIconLocation = allAppsButtonView.x + allAppsButtonView.width / 2
|
||||
x = allAppsIconLocation - layoutParams.width / 2
|
||||
}
|
||||
|
||||
show()
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Set up the provided TextView to display legal disclosures. The method takes locale into
|
||||
* account to show the appropriate links to regional disclosures.
|
||||
*/
|
||||
private fun TaskbarEduTooltip.showDisclosureText(
|
||||
textView: TextView,
|
||||
stringId: Int = R.string.taskbar_edu_circle_to_search_disclosure,
|
||||
) {
|
||||
val locale = resources.configuration.locales[0]
|
||||
val text =
|
||||
SpannableString(
|
||||
HtmlCompat.fromHtml(
|
||||
resources.getString(
|
||||
stringId,
|
||||
PRIVACY_POLICY_BASE_URL + locale.language,
|
||||
TOS_BASE_URL + locale.language,
|
||||
),
|
||||
HtmlCompat.FROM_HTML_MODE_COMPACT,
|
||||
)
|
||||
)
|
||||
// Directly process URLSpan clicks
|
||||
text.getSpans(0, text.length, URLSpan::class.java).forEach { urlSpan ->
|
||||
val url: URLSpan =
|
||||
object : URLSpan(urlSpan.url) {
|
||||
override fun onClick(widget: View) {
|
||||
val uri = Uri.parse(urlSpan.url)
|
||||
val context = widget.context
|
||||
val intent =
|
||||
Intent(Intent.ACTION_VIEW, uri).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
|
||||
context.startActivity(intent)
|
||||
}
|
||||
}
|
||||
|
||||
val spanStart = text.getSpanStart(urlSpan)
|
||||
val spanEnd = text.getSpanEnd(urlSpan)
|
||||
val spanFlags = text.getSpanFlags(urlSpan)
|
||||
text.removeSpan(urlSpan)
|
||||
text.setSpan(url, spanStart, spanEnd, spanFlags)
|
||||
}
|
||||
textView.text = text
|
||||
textView.movementMethod = LinkMovementMethod.getInstance()
|
||||
}
|
||||
|
||||
/** Closes the current [tooltip]. */
|
||||
fun hide() = tooltip?.close(true)
|
||||
|
||||
|
||||
@@ -75,4 +75,8 @@ object OnboardingPrefs {
|
||||
|
||||
@JvmField
|
||||
val HOTSEAT_LONGPRESS_TIP_SEEN = backedUpItem("launcher.hotseat_longpress_tip_seen", false)
|
||||
|
||||
@JvmField
|
||||
val TASKBAR_CIRCLE_TO_SEARCH_EDU_SEEN =
|
||||
backedUpItem("launcher.taskbar_circle_to_search_edu_seen", false)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user