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

Commit 12758423 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Re-enabling task based filtering in Recents using package name."

parents 90dcb625 e0e45bc2

packages/SystemUI/res/drawable/recents_button_bg.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 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.

-->



<ripple xmlns:android="http://schemas.android.com/apk/res/android"

    android:color="?android:attr/colorControlHighlight" />
 
 No newline at end of file

packages/SystemUI/res/layout/recents_task_view.xml

+3 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ 
            android:layout_height="@dimen/recents_task_view_application_icon_size"

            android:layout_marginStart="8dp"

            android:layout_gravity="center_vertical|start"

            android:padding="8dp" />

            android:padding="8dp"

            android:background="@drawable/recents_button_bg" />

        <TextView

            android:id="@+id/activity_description"

            android:layout_width="match_parent"
@@ -57,6 +58,7 @@ 
            android:layout_marginEnd="4dp"

            android:layout_gravity="center_vertical|end"

            android:padding="18dp"

            android:background="@drawable/recents_button_bg"

            android:visibility="invisible"

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

    </com.android.systemui.recents.views.TaskBarView>

packages/SystemUI/res/values/config.xml

+2 −2
Original line number Diff line number Diff line
@@ -111,9 +111,9 @@ 
    <!-- The duration in seconds to wait before the dismiss buttons are shown. -->

    <integer name="recents_task_bar_dismiss_delay_seconds">3</integer>

    <!-- The min animation duration for animating views that are currently visible. -->

    <integer name="recents_filter_animate_current_views_min_duration">175</integer>

    <integer name="recents_filter_animate_current_views_duration">250</integer>

    <!-- The min animation duration for animating views that are newly visible. -->

    <integer name="recents_filter_animate_new_views_min_duration">125</integer>

    <integer name="recents_filter_animate_new_views_duration">250</integer>

    <!-- The min animation duration for animating the task bar in. -->

    <integer name="recents_animate_task_bar_enter_duration">275</integer>

    <!-- The animation delay for animating the first task in. This should roughly be the animation

packages/SystemUI/src/com/android/systemui/recents/Constants.java

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ public class Constants { 
            // Enables the screenshot app->Recents transition

            public static final boolean EnableScreenshotAppTransition = false;

            // Enables the filtering of tasks according to their grouping

            public static final boolean EnableTaskFiltering = false;

            public static final boolean EnableTaskFiltering = true;

            // Enables clipping of tasks against each other

            public static final boolean EnableTaskStackClipping = true;

            // Enables the use of theme colors as the task bar background

packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java

+6 −6
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ public class RecentsConfiguration { 
    public Interpolator quintOutInterpolator;



    /** Filtering */

    public int filteringCurrentViewsMinAnimDuration;

    public int filteringNewViewsMinAnimDuration;

    public int filteringCurrentViewsAnimDuration;

    public int filteringNewViewsAnimDuration;



    /** Insets */

    public Rect systemInsets = new Rect();
@@ -151,10 +151,10 @@ public class RecentsConfiguration { 
                res.getDimensionPixelSize(R.dimen.recents_animation_movement_in_dps_per_second);



        // Filtering

        filteringCurrentViewsMinAnimDuration =

                res.getInteger(R.integer.recents_filter_animate_current_views_min_duration);

        filteringNewViewsMinAnimDuration =

                res.getInteger(R.integer.recents_filter_animate_new_views_min_duration);

        filteringCurrentViewsAnimDuration =

                res.getInteger(R.integer.recents_filter_animate_current_views_duration);

        filteringNewViewsAnimDuration =

                res.getInteger(R.integer.recents_filter_animate_new_views_duration);



        // Insets

        displayRect.set(0, 0, dm.widthPixels, dm.heightPixels);