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

Merge "Fix bouncer swipe touch handler" into tm-dev

Browse Source
This commit is contained in:
Lucas Silva
2022-03-25 20:07:07 +00:00
committed by Android (Google) Code Review
parent d1496fc15c d0c700fc61
commit 8159eedb16
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java
View File

@@ -116,8 +116,10 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler {
// bouncer. As that view's expansion shrinks, the bouncer appears. The bouncer // bouncer. As that view's expansion shrinks, the bouncer appears. The bouncer
// is fully hidden at full expansion (1) and fully visible when fully collapsed // is fully hidden at full expansion (1) and fully visible when fully collapsed
// (0). // (0).
final float screenTravelPercentage = final float dy = mBouncerInitiallyShowing ? e2.getY() - e1.getY()
Math.abs((e1.getY() - e2.getY()) / mCentralSurfaces.getDisplayHeight()); : e1.getY() - e2.getY();
final float screenTravelPercentage = Math.max(0,
dy / mCentralSurfaces.getDisplayHeight());
setPanelExpansion(mBouncerInitiallyShowing setPanelExpansion(mBouncerInitiallyShowing
? screenTravelPercentage : 1 - screenTravelPercentage); ? screenTravelPercentage : 1 - screenTravelPercentage);
return true; return true;

4
packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java
View File

@@ -234,9 +234,9 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase {
final float distanceY = SCREEN_HEIGHT_PX * scrollAmount; final float distanceY = SCREEN_HEIGHT_PX * scrollAmount;
final MotionEvent event1 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_MOVE, final MotionEvent event1 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_MOVE,
0, SCREEN_HEIGHT_PX, 0);
final MotionEvent event2 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_MOVE,
0, SCREEN_HEIGHT_PX - distanceY, 0); 0, SCREEN_HEIGHT_PX - distanceY, 0);
final MotionEvent event2 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_MOVE,
0, SCREEN_HEIGHT_PX, 0);
assertThat(gestureListenerCaptor.getValue().onScroll(event1, event2, 0, distanceY)) assertThat(gestureListenerCaptor.getValue().onScroll(event1, event2, 0, distanceY))
.isTrue(); .isTrue();