Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5453c053 authored by Saumya Prakash's avatar Saumya Prakash
Browse files

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
parent bc657f64

quickstep/res/layout/taskbar_edu_circle_to_search.xml

0 → 100644
+57 −0
Original line number Diff line number Diff line 
<?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>

quickstep/res/raw/taskbar_edu_circle_to_search.json

0 → 100644
+1 −0

File added.

Preview size limit exceeded, changes collapsed.

quickstep/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -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>

quickstep/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -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 &amp; 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 &amp; 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">&lt;a href=\"%1$s\"&gt;</xliff:g>Privacy Policy<xliff:g id="end_privacy_link">&lt;/a&gt;</xliff:g> and <xliff:g example="https://policies.google.com/terms" id="begin_tos_link">&lt;a href=\"%2$s\"&gt;</xliff:g>Terms of Service<xliff:g id="end_tos_link">&lt;/a&gt;</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] -->

quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java

+2 −0
Original line number Diff line number Diff line
@@ -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;

        }