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

Commit 1a42e858 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Fix snooze guts disappearing in split shade" into sc-v2-dev am: eaaeb2f6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16298489

Change-Id: I566ac7c5ea4462df8bdbf3da1ffa2ed880d54cf9
parents 3cca728e eaaeb2f6

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -444,8 +444,8 @@ class NotificationSwipeHelper extends SwipeHelper implements NotificationSwipeAc 
        final int height = (view instanceof ExpandableView)

                ? ((ExpandableView) view).getActualHeight()

                : view.getHeight();

        final int rx = (int) ev.getX();

        final int ry = (int) ev.getY();

        final int rx = (int) ev.getRawX();

        final int ry = (int) ev.getRawY();

        int[] temp = new int[2];

        view.getLocationOnScreen(temp);

        final int x = temp[0];

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelperTest.java

+6 −6
Original line number Diff line number Diff line
@@ -438,8 +438,8 @@ public class NotificationSwipeHelperTest extends SysuiTestCase { 
        assertEquals("returns false when view is null", false,

                NotificationSwipeHelper.isTouchInView(mEvent, null));



        doReturn(5f).when(mEvent).getX();

        doReturn(10f).when(mEvent).getY();

        doReturn(5f).when(mEvent).getRawX();

        doReturn(10f).when(mEvent).getRawY();



        doReturn(20).when(mView).getWidth();

        doReturn(20).when(mView).getHeight();
@@ -455,7 +455,7 @@ public class NotificationSwipeHelperTest extends SysuiTestCase { 
        assertTrue("Touch is within the view",

                mSwipeHelper.isTouchInView(mEvent, mView));



        doReturn(50f).when(mEvent).getX();

        doReturn(50f).when(mEvent).getRawX();



        assertFalse("Touch is not within the view",

                mSwipeHelper.isTouchInView(mEvent, mView));
@@ -466,8 +466,8 @@ public class NotificationSwipeHelperTest extends SysuiTestCase { 
        assertEquals("returns false when view is null", false,

                NotificationSwipeHelper.isTouchInView(mEvent, null));



        doReturn(5f).when(mEvent).getX();

        doReturn(10f).when(mEvent).getY();

        doReturn(5f).when(mEvent).getRawX();

        doReturn(10f).when(mEvent).getRawY();



        doReturn(20).when(mNotificationRow).getWidth();

        doReturn(20).when(mNotificationRow).getActualHeight();
@@ -483,7 +483,7 @@ public class NotificationSwipeHelperTest extends SysuiTestCase { 
        assertTrue("Touch is within the view",

                mSwipeHelper.isTouchInView(mEvent, mNotificationRow));



        doReturn(50f).when(mEvent).getX();

        doReturn(50f).when(mEvent).getRawX();



        assertFalse("Touch is not within the view",

                mSwipeHelper.isTouchInView(mEvent, mNotificationRow));