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

Commit 69d7dfd4 authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Mirrored clear all animation for RTL" into lmp-mr1-dev

parents af2442e9 1d59af45

packages/SystemUI/res/drawable/ic_dismiss_all.xml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:autoMirrored="true"

    android:viewportWidth="48.0"

    android:viewportHeight="48.0">

    <path

packages/SystemUI/src/com/android/systemui/SwipeHelper.java

+4 −1
Original line number Diff line number Diff line
@@ -311,11 +311,14 @@ public class SwipeHelper implements Gefingerpoken { 
        final View animView = mCallback.getChildContentView(view);

        final boolean canAnimViewBeDismissed = mCallback.canChildBeDismissed(view);

        float newPos;

        boolean isLayoutRtl = view.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;



        if (velocity < 0

                || (velocity == 0 && getTranslation(animView) < 0)

                // if we use the Menu to dismiss an item in landscape, animate up

                || (velocity == 0 && getTranslation(animView) == 0 && mSwipeDirection == Y)) {

                || (velocity == 0 && getTranslation(animView) == 0 && mSwipeDirection == Y)

                // if the language is rtl we prefer swiping to the left

                || (velocity == 0 && getTranslation(animView) == 0 && isLayoutRtl)) {

            newPos = -getSize(animView);

        } else {

            newPos = getSize(animView);