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

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

Merge "Turn off filter ui if flag is off" into tm-qpr-dev am: 4835519c am: ec6a7b64 

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



Change-Id: I74a30f8911f25a0fbb3e8198d9078b6316afdf0a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6c4912ae ec6a7b64

quickstep/res/layout/task.xml

+3 −1
Original line number Diff line number Diff line
@@ -28,12 +28,14 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"/>



    <!-- Filtering affects only alpha instead of the visibility since visibility can be altered

         separately through RecentsView#resetFromSplitSelectionState() -->

    <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:alpha="0"

        android:tint="@color/recents_filter_icon"

        android:contentDescription="@string/recents_filter_icon_desc"

        android:importantForAccessibility="no"

quickstep/res/layout/task_grouped.xml

+6 −2
Original line number Diff line number Diff line
@@ -38,23 +38,27 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"/>



    <!-- Filtering affects only alpha instead of the visibility since visibility can be altered

         separately through RecentsView#resetFromSplitSelectionState() -->

    <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:alpha="0"

        android:tint="@color/recents_filter_icon"

        android:contentDescription="@string/recents_filter_icon_desc"

        android:importantForAccessibility="no"

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



    <!-- Filtering affects only alpha instead of the visibility since visibility can be altered

         separately through RecentsView#resetFromSplitSelectionState() -->

    <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:alpha="0"

        android:tint="@color/recents_filter_icon"

        android:contentDescription="@string/recents_filter_icon_desc"

        android:importantForAccessibility="no"

quickstep/src/com/android/quickstep/views/TaskView.java

+4 −2
Original line number Diff line number Diff line
@@ -561,10 +561,12 @@ public class TaskView extends FrameLayout implements Reusable { 
     */

    protected void updateFilterCallback(@NonNull View filterView,

            @Nullable View.OnClickListener callback) {

        // Filtering changes alpha instead of the visibility since visibility

        // can be altered separately through RecentsView#resetFromSplitSelectionState()

        if (callback == null) {

            filterView.setVisibility(GONE);

            filterView.setAlpha(0);

        } else {

            filterView.setVisibility(VISIBLE);

            filterView.setAlpha(1);

        }



        filterView.setOnClickListener(callback);