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

Commit f5e22e71 authored by Winson Chung's avatar Winson Chung
Browse files

Incorporating theme colors into task views. 

Change-Id: Ie7166d78dacabe4bff7afdade2d1da9d0651e403
parent 03a9baed

packages/SystemUI/res/layout/recents_task_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
            android:textSize="22sp"

            android:textColor="#ffffffff"

            android:text="@string/recents_empty_message"

            android:fontFamily="sans-serif-thin"

            android:fontFamily="sans-serif-light"

            android:singleLine="true"

            android:maxLines="2"

            android:ellipsize="marquee"

packages/SystemUI/res/values/config.xml

+3 −1
Original line number Diff line number Diff line
@@ -115,8 +115,10 @@ 
    <integer name="recents_filter_animate_current_views_min_duration">175</integer>

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

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

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

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

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

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

    <integer name="recents_animate_task_bar_exit_duration">150</integer>

    <!-- The animation duration for animating in the info pane. -->

    <integer name="recents_animate_task_view_info_pane_duration">150</integer>

    <!-- The minimum alpha for the dim applied to cards that go deeper into the stack. -->

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

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ public class Constants { 
        public static class App {

            public static final boolean EnableTaskFiltering = false;

            public static final boolean EnableTaskStackClipping = false;

            public static final boolean EnableTaskBarThemeColors = true;

            public static final boolean EnableInfoPane = true;

            public static final boolean EnableSearchButton = false;

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

+17 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ public class RecentsConfiguration { 
    public int filteringCurrentViewsMinAnimDuration;

    public int filteringNewViewsMinAnimDuration;

    public int taskBarEnterAnimDuration;

    public int taskBarExitAnimDuration;

    public int taskStackScrollDismissInfoPaneDistance;

    public int taskStackMaxDim;

    public int taskViewInfoPaneAnimDuration;
@@ -47,6 +48,11 @@ public class RecentsConfiguration { 
    public int searchBarSpaceHeightPx;

    public int searchBarSpaceEdgeMarginsPx;



    public int taskBarViewDefaultBackgroundColor;

    public int taskBarViewDefaultTextColor;

    public int taskBarViewLightTextColor;

    public int taskBarViewDarkTextColor;



    public boolean launchedWithThumbnailAnimation;



    /** Private constructor */
@@ -87,6 +93,8 @@ public class RecentsConfiguration { 
                res.getInteger(R.integer.recents_filter_animate_new_views_min_duration);

        taskBarEnterAnimDuration =

                res.getInteger(R.integer.recents_animate_task_bar_enter_duration);

        taskBarExitAnimDuration =

                res.getInteger(R.integer.recents_animate_task_bar_exit_duration);

        taskStackScrollDismissInfoPaneDistance = res.getDimensionPixelSize(

                R.dimen.recents_task_stack_scroll_dismiss_info_pane_distance);

        taskStackMaxDim = res.getInteger(R.integer.recents_max_task_stack_view_dim);
@@ -97,6 +105,15 @@ public class RecentsConfiguration { 
        searchBarSpaceHeightPx = res.getDimensionPixelSize(R.dimen.recents_search_bar_space_height);

        searchBarSpaceEdgeMarginsPx =

                res.getDimensionPixelSize(R.dimen.recents_search_bar_space_edge_margins);



        taskBarViewDefaultBackgroundColor =

                res.getColor(R.color.recents_task_bar_default_background_color);

        taskBarViewDefaultTextColor =

                res.getColor(R.color.recents_task_bar_default_text_color);

        taskBarViewLightTextColor =

                res.getColor(R.color.recents_task_bar_light_text_color);

        taskBarViewDarkTextColor =

                res.getColor(R.color.recents_task_bar_dark_text_color);

    }



    /** Updates the system insets */

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

+11 −5
Original line number Diff line number Diff line
@@ -415,17 +415,23 @@ public class RecentsTaskLoader { 
            ActivityInfo info = ssp.getActivityInfo(t.baseIntent.getComponent(), t.userId);

            if (info == null) continue;



            String activityLabel = (t.activityLabel == null ? ssp.getActivityLabel(info) :

                    t.activityLabel.toString());

            ActivityManager.RecentsActivityValues av = t.activityValues;

            String activityLabel = null;

            BitmapDrawable activityIcon = null;

            if (t.activityIcon != null) {

                activityIcon = new BitmapDrawable(res, t.activityIcon);

            int activityColor = 0;

            if (av != null) {

                activityLabel = (av.label != null ? av.label.toString() :

                        ssp.getActivityLabel(info));

                activityIcon = (av.icon != null) ? new BitmapDrawable(res, av.icon) : null;

                activityColor = av.colorPrimary;

            } else {

                activityLabel = ssp.getActivityLabel(info);

            }

            boolean isForemostTask = (i == (taskCount - 1));



            // Create a new task

            Task task = new Task(t.persistentId, (t.id > -1), t.baseIntent, activityLabel,

                    activityIcon, t.userId);

                    activityIcon, activityColor, t.userId);



            // Preload the specified number of apps

            if (i >= (taskCount - preloadCount)) {