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

Commit 19440368 authored by Saumya Prakash's avatar Saumya Prakash
Browse files

Only run search edu when enabled, also make code more generic. 

We only need to run the Search edu if it is enabled on devices. The code
itself is also made more generic in terms of method and variable names.

Fix: 330401405
Test: Enable and disable the search function and check whether the edu tooltip shows
up for each specific use case.
Flag: ACONFIG com.android.launcher3.enable_taskbar_pinning NEXTFOOD

Change-Id: I1cea3ee56922c0b47ae7e8379aad4b36570daa17
Merged-In: I1cea3ee56922c0b47ae7e8379aad4b36570daa17
parent 31b7966a

quickstep/res/layout/taskbar_edu_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_search_edu_title"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toTopOf="@+id/search_edu_animation" />



    <com.airbnb.lottie.LottieAnimationView

        android:id="@+id/search_edu_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/search_edu_text"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toBottomOf="@id/title"

        app:lottie_rawRes="@raw/taskbar_edu_search"

        app:lottie_autoPlay="true"

        app:lottie_loop="true" />



    <TextView

        android:id="@+id/search_edu_text"

        style="@style/TextAppearance.TaskbarEduTooltip.Subtext"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="center"

        android:textSize="@dimen/taskbar_edu_search_subtitle_text_size"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toBottomOf="@id/search_edu_animation"

        app:layout_constraintBottom_toBottomOf="parent" />



</androidx.constraintlayout.widget.ConstraintLayout>

quickstep/res/raw/taskbar_edu_search.json

0 → 100644
+1 −0

File added.

Preview size limit exceeded, changes collapsed.

quickstep/res/values/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
    <string name="test_information_handler_class" translatable="false">com.android.quickstep.QuickstepTestInformationHandler</string>

    <string name="window_manager_proxy_class" translatable="false">com.android.quickstep.util.SystemWindowManagerProxy</string>

    <string name="widget_holder_factory_class" translatable="false">com.android.launcher3.uioverrides.QuickstepWidgetHolder$QuickstepHolderFactory</string>

    <string name="taskbar_edu_tooltip_controller_class" translatable="false">com.android.launcher3.taskbar.TaskbarEduTooltipController</string>



    <!-- The number of thumbnails and icons to keep in the cache. The thumbnail cache size also

         determines how many thumbnails will be fetched in the background. -->

quickstep/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -400,6 +400,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_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 Search feature. [CHAR_LIMIT 150] -->

    <string name="taskbar_search_edu_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_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] -->