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

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

Fixing minor issue with freeform workspace not showing. 

- Also slightly tweaking drop target sizes to be a bit smaller

Change-Id: I0e877e64acba5dd165c0d7a2cffb24dea88d673f
parent 66837204

packages/SystemUI/res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
    <!-- The lock to task button foreground color. -->

    <color name="recents_task_view_lock_to_app_button_color">#ff666666</color>

    <!-- The background color for the freeform workspace. -->

    <color name="recents_freeform_workspace_bg_color">#66000000</color>

    <color name="recents_freeform_workspace_bg_color">#33FFFFFF</color>



    <color name="keyguard_affordance">#ffffffff</color>

packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java

+4 −4
Original line number Diff line number Diff line
@@ -232,16 +232,16 @@ public class TaskStack { 
        public static final DockState NONE = new DockState(-1, 96, null, null);

        public static final DockState LEFT = new DockState(

                DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT, DOCK_AREA_ALPHA,

                new RectF(0, 0, 0.25f, 1), new RectF(0, 0, 0.25f, 1));

                new RectF(0, 0, 0.15f, 1), new RectF(0, 0, 0.15f, 1));

        public static final DockState TOP = new DockState(

                DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT, DOCK_AREA_ALPHA,

                new RectF(0, 0, 1, 0.25f), new RectF(0, 0, 1, 0.25f));

                new RectF(0, 0, 1, 0.15f), new RectF(0, 0, 1, 0.15f));

        public static final DockState RIGHT = new DockState(

                DOCKED_STACK_CREATE_MODE_BOTTOM_OR_RIGHT, DOCK_AREA_ALPHA,

                new RectF(0.75f, 0, 1, 1), new RectF(0.75f, 0, 1, 1));

                new RectF(0.85f, 0, 1, 1), new RectF(0.85f, 0, 1, 1));

        public static final DockState BOTTOM = new DockState(

                DOCKED_STACK_CREATE_MODE_BOTTOM_OR_RIGHT, DOCK_AREA_ALPHA,

                new RectF(0, 0.75f, 1, 1), new RectF(0, 0.75f, 1, 1));

                new RectF(0, 0.85f, 1, 1), new RectF(0, 0.85f, 1, 1));



        @Override

        public boolean acceptsDrop(int x, int y, int width, int height) {

packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ public class TaskStackLayoutAlgorithm { 
     */

    public static class StackState {



        public static final StackState FREEFORM_ONLY = new StackState(1f, 0);

        public static final StackState FREEFORM_ONLY = new StackState(1f, 255);

        public static final StackState STACK_ONLY = new StackState(0f, 0);

        public static final StackState SPLIT = new StackState(0.5f, 255);

packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java

+2 −1
Original line number Diff line number Diff line
@@ -216,7 +216,8 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal 
                R.drawable.recents_freeform_workspace_bg);

        mFreeformWorkspaceBackground.setCallback(this);

        if (ssp.hasFreeformWorkspaceSupport()) {

            setBackgroundColor(getContext().getColor(R.color.recents_freeform_workspace_bg_color));

            mFreeformWorkspaceBackground.setColor(

                    getContext().getColor(R.color.recents_freeform_workspace_bg_color));

        }

    }