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

Commit 8f8155ba authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Dim harder when dismissing 

Also fix a bug when selecting the dim target stack.

Change-Id: Id9d5e28caf5e810c7eef1e3b0fd7a9f945f8d146
parent 18b6618f

core/java/com/android/internal/policy/DividerSnapAlgorithm.java

+6 −1
Original line number Diff line number Diff line
@@ -139,7 +139,12 @@ public class DividerSnapAlgorithm { 
    }



    public SnapTarget getClosestDismissTarget(int position) {

        if (position - mDismissStartTarget.position < mDismissEndTarget.position - position) {

        if (position < mFirstSplitTarget.position) {

            return mDismissStartTarget;

        } else if (position > mLastSplitTarget.position) {

            return mDismissEndTarget;

        } else if (position - mDismissStartTarget.position

                < mDismissEndTarget.position - position) {

            return mDismissStartTarget;

        } else {

            return mDismissEndTarget;

packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java

+4 −4
Original line number Diff line number Diff line
@@ -73,8 +73,6 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
    private static final String TAG = "DividerView";



    private static final int TASK_POSITION_SAME = Integer.MAX_VALUE;

    private static final float DIM_START_FRACTION = 0.5f;

    private static final float DIM_DAMP_FACTOR = 1.7f;



    /**

     * Fraction of the divider position between two snap targets to switch to the full-screen
@@ -90,6 +88,8 @@ public class DividerView extends FrameLayout implements OnTouchListener, 


    private static final PathInterpolator SLOWDOWN_INTERPOLATOR =

            new PathInterpolator(0.5f, 1f, 0.5f, 1f);

    private static final PathInterpolator DIM_INTERPOLATOR =

            new PathInterpolator(.23f, .87f, .52f, -0.11f);



    private DividerHandleView mHandle;

    private View mBackground;
@@ -497,8 +497,8 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
            mWindowManagerProxy.resizeDockedStack(mDockedRect, null, null, null, null);

        }

        float fraction = mSnapAlgorithm.calculateDismissingFraction(position);

        fraction = Math.max(0,

                Math.min((fraction / DIM_START_FRACTION - 1f) / DIM_DAMP_FACTOR, 1f));

        fraction = Math.max(0, Math.min(fraction, 1f));

        fraction = DIM_INTERPOLATOR.getInterpolation(fraction);

        mWindowManagerProxy.setResizeDimLayer(fraction != 0f,

                getStackIdForDismissTarget(mSnapAlgorithm.getClosestDismissTarget(position)),

                fraction);