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

Commit e4b2b306 authored by Miranda Kephart's avatar Miranda Kephart
Browse files

Limit maximum dismiss distance for screenshot/clipboard UI 

On large screens, the dismissal animation can take an unusually
long time because it has to travel all the way to the edge of the
screen. This change limits the maximum distance to 400dp (at which
point the view is faded out completely).

Bug: 271456963
Fix: 271456963
Test: manual (visual change)
Change-Id: I2fe06f9bf8aba8cfd92969cc72ccd31e303a352c
parent 99dc404b

packages/SystemUI/src/com/android/systemui/screenshot/DraggableConstraintLayout.java

+8 −3
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ public class DraggableConstraintLayout extends ConstraintLayout 
        implements ViewTreeObserver.OnComputeInternalInsetsListener {



    private static final float VELOCITY_DP_PER_MS = 1;

    private static final int MAXIMUM_DISMISS_DISTANCE_DP = 400;



    private final SwipeDismissHandler mSwipeDismissHandler;

    private final GestureDetector mSwipeDetector;
@@ -347,14 +348,18 @@ public class DraggableConstraintLayout extends ConstraintLayout 
            } else {

                finalX = -1 * getBackgroundRight();

            }

            float distance = Math.abs(finalX - startX);

            float distance = Math.min(Math.abs(finalX - startX),

                    FloatingWindowUtil.dpToPx(mDisplayMetrics, MAXIMUM_DISMISS_DISTANCE_DP));

            // ensure that view dismisses in the right direction (right in LTR, left in RTL)

            float distanceVector = Math.copySign(distance, finalX - startX);



            anim.addUpdateListener(animation -> {

                float translation = MathUtils.lerp(startX, finalX, animation.getAnimatedFraction());

                float translation = MathUtils.lerp(

                        startX, startX + distanceVector, animation.getAnimatedFraction());

                mView.setTranslationX(translation);

                mView.setAlpha(1 - animation.getAnimatedFraction());

            });

            anim.setDuration((long) (distance / Math.abs(velocity)));

            anim.setDuration((long) (Math.abs(distance / velocity)));

            return anim;

        }