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

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

Merge "Fixing touch handling on resized tasks."

parents 4c956456 23afcae8

packages/SystemUI/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -232,6 +232,9 @@ 
    <!-- The size of the lock-to-app button icon. -->

    <dimen name="recents_lock_to_app_icon_size">28dp</dimen>



    <!-- The amount to allow the stack to overscroll. -->

    <dimen name="recents_stack_overscroll">24dp</dimen>



    <!-- Space reserved for the cards behind the top card in the top stack -->

    <dimen name="top_stack_peek_amount">12dp</dimen>

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

+0 −2
Original line number Diff line number Diff line
@@ -64,8 +64,6 @@ public class Constants { 
        }



        public static class TaskStackView {

            public static final int TaskStackMinOverscrollRange = 32;

            public static final int TaskStackMaxOverscrollRange = 128;

            public static final int FilterStartDelay = 25;

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ public class RecentsImpl extends IRecentsNonSystemUserCallbacks.Stub 
        TaskStackViewLayoutAlgorithm algo = mDummyStackView.getStackAlgorithm();

        Rect taskStackBounds = new Rect(mTaskStackBounds);

        algo.setSystemInsets(systemInsets);

        algo.computeRects(windowRect.width(), windowRect.height(), taskStackBounds);

        algo.computeRects(taskStackBounds);

        Rect taskViewBounds = algo.getUntransformedTaskViewBounds();

        if (!taskViewBounds.equals(mLastTaskViewBounds)) {

            mLastTaskViewBounds.set(taskViewBounds);

packages/SystemUI/src/com/android/systemui/recents/misc/ParametricCurve.java

+9 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ public class ParametricCurve { 


    float[] xp;

    float[] px;

    float mLength;



    CurveFunction mFn;

    ParametricCurveFunction mScaleFn;
@@ -79,6 +80,7 @@ public class ParametricCurve { 
            dx[xStep] = (float) Math.hypot(fx[xStep] - fx[xStep - 1], step);

            pLength += dx[xStep];

        }

        mLength = pLength;

        // Approximate p(x), a function of cumulative progress with x, normalized to 0..1

        float p = 0;

        px[0] = 0f;
@@ -260,4 +262,11 @@ public class ParametricCurve { 
        }

        return 1f - xToP(maxX, bounds);

    }



    /**

     * Returns the length of this curve.

     */

    public float getArcLength() {

        return mLength;

    }

}

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

+6 −0
Original line number Diff line number Diff line
@@ -170,6 +170,12 @@ public class Task { 
        }

    }



    public boolean isFreeformTask() {

        // Temporarily disable:

        return false;

        // return SystemServicesProxy.isFreeformStack(key.stackId);

    }



    /** Notifies the callback listeners that this task has been loaded */

    public void notifyTaskDataLoaded(Bitmap thumbnail, Drawable applicationIcon) {

        this.applicationIcon = applicationIcon;