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

Commit f7315dd1 authored by Michael Jurka's avatar Michael Jurka Committed by Android (Google) Code Review
Browse files

Merge "Fix regression: recents did not dismiss after launching apps (5252649)"

parents 572527f2 c6461ca5

packages/SystemUI/res/layout-land/status_bar_recent_item.xml

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
            android:layout_alignParentTop="true"

            android:layout_marginLeft="@dimen/status_bar_recents_thumbnail_left_margin"

            android:scaleType="center"

            android:clickable="true"

            android:background="@drawable/recents_thumbnail_overlay">

            <ImageView android:id="@+id/app_thumbnail_image"

                android:layout_width="match_parent"

packages/SystemUI/res/layout-port/status_bar_recent_item.xml

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
            android:layout_height="wrap_content"

            android:layout_alignParentLeft="true"

            android:layout_alignParentTop="true"

            android:clickable="true"

            android:layout_marginLeft="@dimen/status_bar_recents_thumbnail_left_margin"

            android:scaleType="center"

            android:background="@drawable/recents_thumbnail_overlay">

packages/SystemUI/res/layout-port/status_bar_recent_panel.xml

+1 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
            android:orientation="horizontal"

            android:clipChildren="false"

            android:layout_marginTop="@*android:dimen/status_bar_height">



            <com.android.systemui.recent.RecentsVerticalScrollView

                android:id="@+id/recents_container"

                android:layout_width="match_parent"
@@ -62,7 +63,6 @@ 


            </com.android.systemui.recent.RecentsVerticalScrollView>





        </LinearLayout>



    </FrameLayout>

packages/SystemUI/res/layout-sw600dp/status_bar_recent_item.xml

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
        android:layout_height="wrap_content"

        android:layout_alignParentLeft="true"

        android:layout_alignParentTop="true"

        android:clickable="true"

        android:layout_marginLeft="@dimen/status_bar_recents_thumbnail_left_margin"

        android:scaleType="center"

        android:background="@drawable/recents_thumbnail_overlay">

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

+5 −1
Original line number Diff line number Diff line
@@ -196,7 +196,11 @@ public class SwipeHelper { 
        final View animView = mCallback.getChildContentView(view);

        final boolean canAnimViewBeDismissed = mCallback.canChildBeDismissed(view);

        float newPos;

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



        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)) {

            newPos = -getSize(animView);

        } else {

            newPos = getSize(animView);