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

Commit de88fbb2 authored by Ikram Gabiyev's avatar Ikram Gabiyev Committed by Automerger Merge Worker
Browse files

Merge "Filter recents view instances by package name" into tm-qpr-dev am: 231e061a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20342914



Change-Id: Ie221571adf3a3ce537e50de97ecc010d4795e272
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b2a8621a 231e061a

quickstep/res/layout/task.xml

+11 −0
Original line number Diff line number Diff line
@@ -28,6 +28,17 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"/>



    <ImageView

        android:id="@+id/show_windows"

        android:layout_height="@dimen/recents_filter_icon_size"

        android:layout_width="@dimen/recents_filter_icon_size"

        android:layout_gravity="end"

        android:visibility="gone"

        android:tint="@color/recents_filter_icon"

        android:contentDescription="@string/recents_filter_icon_desc"

        android:importantForAccessibility="no"

        android:src="@drawable/ic_select_windows" />



    <com.android.quickstep.views.IconView

        android:id="@+id/icon"

        android:layout_width="@dimen/task_thumbnail_icon_size"

quickstep/res/layout/task_grouped.xml

+22 −0
Original line number Diff line number Diff line
@@ -38,6 +38,28 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"/>



    <ImageView

        android:id="@+id/show_windows"

        android:layout_height="@dimen/recents_filter_icon_size"

        android:layout_width="@dimen/recents_filter_icon_size"

        android:layout_gravity="start"

        android:visibility="gone"

        android:tint="@color/recents_filter_icon"

        android:contentDescription="@string/recents_filter_icon_desc"

        android:importantForAccessibility="no"

        android:src="@drawable/ic_select_windows" />



    <ImageView

        android:id="@+id/show_windows_right"

        android:layout_height="@dimen/recents_filter_icon_size"

        android:layout_width="@dimen/recents_filter_icon_size"

        android:layout_gravity="end"

        android:visibility="gone"

        android:tint="@color/recents_filter_icon"

        android:contentDescription="@string/recents_filter_icon_desc"

        android:importantForAccessibility="no"

        android:src="@drawable/ic_select_windows" />



    <com.android.quickstep.views.IconView

        android:id="@+id/icon"

        android:layout_width="@dimen/task_thumbnail_icon_size"

quickstep/res/values/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -76,4 +76,7 @@ 


    <color name="all_set_page_background">#FFFFFFFF</color>



    <!-- Recents overview -->

    <color name="recents_filter_icon">#333333</color>



</resources>
 
 No newline at end of file

quickstep/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -306,6 +306,9 @@ 
    <dimen name="taskbar_button_margin_6_5">75dp</dimen>

    <dimen name="taskbar_button_margin_default">48dp</dimen>



    <!-- Recents overview -->

    <dimen name="recents_filter_icon_size">30dp</dimen>



    <!-- Launcher splash screen -->

    <!-- Note: keep this value in sync with the WindowManager/Shell dimens.xml -->

    <!--     starting_surface_exit_animation_window_shift_length -->

quickstep/res/values/strings.xml

+7 −0
Original line number Diff line number Diff line
@@ -36,6 +36,13 @@ 
    <!-- Recents: Title of a button that clears the task list, i.e. closes all tasks. [CHAR LIMIT=30] -->

    <string name="recents_clear_all">Clear all</string>



    <!-- Recents: Title of a button that goes back from displaying tasks filtered by package name to displaying all tasks [CHAR LIMIT=30] -->

    <string name="recents_back" translatable="false">Back</string>



    <!-- TODO: b/260610444. Content description of filtering icons needs to be updated -->

    <!-- Recents: Content description for the icon on top of taskviews to initiate filtering -->

    <string name="recents_filter_icon_desc" translatable="false">Click to show only this app\'s tasks</string>



    <!-- Accessibility title for the list of recent apps [CHAR_LIMIT=none] -->

    <string name="accessibility_recent_apps">Recent apps</string>