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

Merge "Pass the values of the MotionEvent instead of the event instance itself to BackAnimation." into tm-dev am: 1deb1af4a7

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

Change-Id: I24f8b034e3bfdc15493c8f2a2716985fddc4deab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shan Huang
2022-06-21 18:34:51 +00:00
committed by Automerger Merge Worker
parent f6c9d9d376 1deb1af4a7
commit a79aed78d5
4 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimation.java
View File

@@ -31,13 +31,15 @@ public interface BackAnimation {
/** /**
* Called when a {@link MotionEvent} is generated by a back gesture. * Called when a {@link MotionEvent} is generated by a back gesture.
* *
* @param event the original {@link MotionEvent} * @param touchX the X touch position of the {@link MotionEvent}.
* @param action the original {@link KeyEvent#getAction()} when the event was dispatched to * @param touchY the Y touch position of the {@link MotionEvent}.
* @param keyAction the original {@link KeyEvent#getAction()} when the event was dispatched to
* the process. This is forwarded separately because the input pipeline may mutate * the process. This is forwarded separately because the input pipeline may mutate
* the {#event} action state later. * the {#event} action state later.
* @param swipeEdge the edge from which the swipe begins. * @param swipeEdge the edge from which the swipe begins.
*/ */
void onBackMotion(MotionEvent event, int action, @BackEvent.SwipeEdge int swipeEdge); void onBackMotion(float touchX, float touchY, int keyAction,
@BackEvent.SwipeEdge int swipeEdge);
/** /**
* Sets whether the back gesture is past the trigger threshold or not. * Sets whether the back gesture is past the trigger threshold or not.

27
libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
View File

@@ -184,8 +184,8 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
@Override @Override
public void onBackMotion( public void onBackMotion(
MotionEvent event, int action, @BackEvent.SwipeEdge int swipeEdge) { float touchX, float touchY, int keyAction, @BackEvent.SwipeEdge int swipeEdge) {
mShellExecutor.execute(() -> onMotionEvent(event, action, swipeEdge)); mShellExecutor.execute(() -> onMotionEvent(touchX, touchY, keyAction, swipeEdge));
} }
@Override @Override
@@ -256,33 +256,34 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
* Called when a new motion event needs to be transferred to this * Called when a new motion event needs to be transferred to this
* {@link BackAnimationController} * {@link BackAnimationController}
*/ */
public void onMotionEvent(MotionEvent event, int action, @BackEvent.SwipeEdge int swipeEdge) { public void onMotionEvent(float touchX, float touchY, int keyAction,
@BackEvent.SwipeEdge int swipeEdge) {
if (mTransitionInProgress) { if (mTransitionInProgress) {
return; return;
} }
if (action == MotionEvent.ACTION_MOVE) { if (keyAction == MotionEvent.ACTION_MOVE) {
if (!mBackGestureStarted) { if (!mBackGestureStarted) {
// Let the animation initialized here to make sure the onPointerDownOutsideFocus // Let the animation initialized here to make sure the onPointerDownOutsideFocus
// could be happened when ACTION_DOWN, it may change the current focus that we // could be happened when ACTION_DOWN, it may change the current focus that we
// would access it when startBackNavigation. // would access it when startBackNavigation.
initAnimation(event); initAnimation(touchX, touchY);
} }
onMove(event, swipeEdge); onMove(touchX, touchY, swipeEdge);
} else if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) { } else if (keyAction == MotionEvent.ACTION_UP || keyAction == MotionEvent.ACTION_CANCEL) {
ProtoLog.d(WM_SHELL_BACK_PREVIEW, ProtoLog.d(WM_SHELL_BACK_PREVIEW,
"Finishing gesture with event action: %d", action); "Finishing gesture with event action: %d", keyAction);
onGestureFinished(); onGestureFinished();
} }
} }
private void initAnimation(MotionEvent event) { private void initAnimation(float touchX, float touchY) {
ProtoLog.d(WM_SHELL_BACK_PREVIEW, "initAnimation mMotionStarted=%b", mBackGestureStarted); ProtoLog.d(WM_SHELL_BACK_PREVIEW, "initAnimation mMotionStarted=%b", mBackGestureStarted);
if (mBackGestureStarted || mBackNavigationInfo != null) { if (mBackGestureStarted || mBackNavigationInfo != null) {
Log.e(TAG, "Animation is being initialized but is already started."); Log.e(TAG, "Animation is being initialized but is already started.");
finishAnimation(); finishAnimation();
} }
mInitTouchLocation.set(event.getX(), event.getY()); mInitTouchLocation.set(touchX, touchY);
mBackGestureStarted = true; mBackGestureStarted = true;
try { try {
@@ -351,18 +352,18 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
mTransaction.setVisibility(screenshotSurface, true); mTransaction.setVisibility(screenshotSurface, true);
} }
private void onMove(MotionEvent event, @BackEvent.SwipeEdge int swipeEdge) { private void onMove(float touchX, float touchY, @BackEvent.SwipeEdge int swipeEdge) {
if (!mBackGestureStarted || mBackNavigationInfo == null) { if (!mBackGestureStarted || mBackNavigationInfo == null) {
return; return;
} }
int deltaX = Math.round(event.getX() - mInitTouchLocation.x); int deltaX = Math.round(touchX - mInitTouchLocation.x);
float progressThreshold = PROGRESS_THRESHOLD >= 0 ? PROGRESS_THRESHOLD : mProgressThreshold; float progressThreshold = PROGRESS_THRESHOLD >= 0 ? PROGRESS_THRESHOLD : mProgressThreshold;
float progress = Math.min(Math.max(Math.abs(deltaX) / progressThreshold, 0), 1); float progress = Math.min(Math.max(Math.abs(deltaX) / progressThreshold, 0), 1);
int backType = mBackNavigationInfo.getType(); int backType = mBackNavigationInfo.getType();
RemoteAnimationTarget animationTarget = mBackNavigationInfo.getDepartingAnimationTarget(); RemoteAnimationTarget animationTarget = mBackNavigationInfo.getDepartingAnimationTarget();
BackEvent backEvent = new BackEvent( BackEvent backEvent = new BackEvent(
event.getX(), event.getY(), progress, swipeEdge, animationTarget); touchX, touchY, progress, swipeEdge, animationTarget);
IOnBackInvokedCallback targetCallback = null; IOnBackInvokedCallback targetCallback = null;
if (shouldDispatchToLauncher(backType)) { if (shouldDispatchToLauncher(backType)) {
targetCallback = mBackToLauncherCallback; targetCallback = mBackToLauncherCallback;

2
libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java
View File

@@ -298,7 +298,7 @@ public class BackAnimationControllerTest {
private void doMotionEvent(int actionDown, int coordinate) { private void doMotionEvent(int actionDown, int coordinate) {
mController.onMotionEvent( mController.onMotionEvent(
MotionEvent.obtain(0, mEventTime, actionDown, coordinate, coordinate, 0), coordinate, coordinate,
actionDown, actionDown,
BackEvent.EDGE_LEFT); BackEvent.EDGE_LEFT);
mEventTime += 10; mEventTime += 10;

2
packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java
View File

@@ -486,7 +486,7 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl
public void onMotionEvent(MotionEvent event) { public void onMotionEvent(MotionEvent event) {
if (mBackAnimation != null) { if (mBackAnimation != null) {
mBackAnimation.onBackMotion( mBackAnimation.onBackMotion(
event, event.getX(), event.getY(),
event.getActionMasked(), event.getActionMasked(),
mIsLeftPanel ? BackEvent.EDGE_LEFT : BackEvent.EDGE_RIGHT); mIsLeftPanel ? BackEvent.EDGE_LEFT : BackEvent.EDGE_RIGHT);
} }