Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only do snapback animations on Swipeable views" into udc-dev am: 758dc44ba4 am: ee37fe3926

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

Change-Id: Iffc4cb05d55b16f138200b40319ecfd8cdf889e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-23 00:40:01 +00:00
committed by Automerger Merge Worker
parent 206d368570 ee37fe3926
commit 5e050349ef
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -354,7 +354,11 @@ class NotificationSwipeHelper extends SwipeHelper implements NotificationSwipeAc
@Override @Override
protected void snapChild(final View animView, final float targetLeft, float velocity) { protected void snapChild(final View animView, final float targetLeft, float velocity) {
superSnapChild(animView, targetLeft, velocity); if (animView instanceof SwipeableView) {
// only perform the snapback animation on views that are swipeable inside the shade.
superSnapChild(animView, targetLeft, velocity);
}
mCallback.onDragCancelled(animView); mCallback.onDragCancelled(animView);
if (targetLeft == 0) { if (targetLeft == 0) {
handleMenuCoveredOrDismissed(); handleMenuCoveredOrDismissed();

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

@@ -392,23 +392,32 @@ public class NotificationSwipeHelperTest extends SysuiTestCase {
@Test @Test
public void testSnapchild_targetIsZero() { public void testSnapchild_targetIsZero() {
doNothing().when(mSwipeHelper).superSnapChild(mView, 0, 0); doNothing().when(mSwipeHelper).superSnapChild(mNotificationRow, 0, 0);
mSwipeHelper.snapChild(mView, 0, 0); mSwipeHelper.snapChild(mNotificationRow, 0, 0);
verify(mCallback, times(1)).onDragCancelled(mView); verify(mCallback, times(1)).onDragCancelled(mNotificationRow);
verify(mSwipeHelper, times(1)).superSnapChild(mView, 0, 0); verify(mSwipeHelper, times(1)).superSnapChild(mNotificationRow, 0, 0);
verify(mSwipeHelper, times(1)).handleMenuCoveredOrDismissed(); verify(mSwipeHelper, times(1)).handleMenuCoveredOrDismissed();
} }
@Test @Test
public void testSnapchild_targetNotZero() { public void testSnapchild_targetNotZero() {
doNothing().when(mSwipeHelper).superSnapChild(mNotificationRow, 10, 0);
mSwipeHelper.snapChild(mNotificationRow, 10, 0);
verify(mCallback, times(1)).onDragCancelled(mNotificationRow);
verify(mSwipeHelper, times(1)).superSnapChild(mNotificationRow, 10, 0);
verify(mSwipeHelper, times(0)).handleMenuCoveredOrDismissed();
}
@Test
public void testSnapchild_targetNotSwipeable() {
doNothing().when(mSwipeHelper).superSnapChild(mView, 10, 0); doNothing().when(mSwipeHelper).superSnapChild(mView, 10, 0);
mSwipeHelper.snapChild(mView, 10, 0); mSwipeHelper.snapChild(mView, 10, 0);
verify(mCallback, times(1)).onDragCancelled(mView); verify(mCallback).onDragCancelled(mView);
verify(mSwipeHelper, times(1)).superSnapChild(mView, 10, 0); verify(mSwipeHelper, never()).superSnapChild(mView, 10, 0);
verify(mSwipeHelper, times(0)).handleMenuCoveredOrDismissed();
} }
@Test @Test