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

Commit 17cd6ca6 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
parent 782af232

quickstep/res/layout/taskbar_edu_circle_to_search.xml→quickstep/res/layout/taskbar_edu_search.xml

+8 −8
Original line number Diff line number Diff line
@@ -23,35 +23,35 @@ 
        style="@style/TextAppearance.TaskbarEduTooltip.Title"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:text="@string/taskbar_edu_circle_to_search_title"

        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/circle_to_search_animation" />

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



    <com.airbnb.lottie.LottieAnimationView

        android:id="@+id/circle_to_search_animation"

        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/circle_to_search_text"

        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_circle_to_search"

        app:lottie_rawRes="@raw/taskbar_edu_search"

        app:lottie_autoPlay="true"

        app:lottie_loop="true" />



    <TextView

        android:id="@+id/circle_to_search_text"

        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_circle_to_search_subtitle_text_size"

        android:textSize="@dimen/taskbar_edu_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_constraintTop_toBottomOf="@id/search_edu_animation"

        app:layout_constraintBottom_toBottomOf="parent" />



</androidx.constraintlayout.widget.ConstraintLayout>

quickstep/res/values/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
    <string name="taskbar_view_callbacks_factory_class" translatable="false">com.android.launcher3.taskbar.TaskbarViewCallbacksFactory</string>

    <string name="launcher_restore_event_logger_class" translatable="false">com.android.quickstep.LauncherRestoreEventLoggerImpl</string>

    <string name="plugin_manager_wrapper_class" translatable="false">com.android.launcher3.uioverrides.plugins.PluginManagerWrapperImpl</string>

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



    <string name="nav_handle_long_press_handler_class" translatable="false"></string>

    <string name="assist_utils_class" translatable="false"></string>

quickstep/res/values/dimens.xml

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

    <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

+3 −3
Original line number Diff line number Diff line
@@ -275,10 +275,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>

    <!-- 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_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>

    <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] -->