openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Let Launcher handle proxy touch events even if it is not focused" into ub-launcher3-edmonton

This commit is contained in:
android-build-team Robot 2018-04-28 00:25:01 +00:00 committed by Android (Google) Code Review
parent cbebaa19f9 09cc13e20c
commit 68f138990b
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
quickstep/src/com/android/quickstep/TouchInteractionService.java
View File

@ -22,6 +22,8 @@ import static android.view.MotionEvent.ACTION_POINTER_DOWN;
import static android.view.MotionEvent.ACTION_POINTER_UP;
import static android.view.MotionEvent.ACTION_UP;
import static com.android.systemui.shared.system.ActivityManagerWrapper
.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_NONE;
import android.annotation.TargetApi;
@ -256,7 +258,6 @@ public class TouchInteractionService extends Service {
private boolean mTrackingStarted = false;
private boolean mInvalidated = false;
private boolean mHadWindowFocusOnDown;
private float mLastProgress = 0;
private boolean mStartPending = false;
@ -281,8 +282,7 @@ public class TouchInteractionService extends Service {
if (action == ACTION_DOWN) {
mTrackingStarted = false;
mDownPos.set(ev.getX(), ev.getY());
mHadWindowFocusOnDown = mTarget.hasWindowFocus();
} else if (!mTrackingStarted && mHadWindowFocusOnDown) {
} else if (!mTrackingStarted) {
switch (action) {
case ACTION_POINTER_UP:
case ACTION_POINTER_DOWN:
@ -327,12 +327,24 @@ public class TouchInteractionService extends Service {
ev.setEdgeFlags(flags);
}
@Override
public void onQuickStep(float eventX, float eventY, long eventTime) {
if (mInvalidated) {
return;
}
mActivityHelper.onQuickstepGestureStarted(mActivity, true);
ActivityManagerWrapper.getInstance()
.closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
}
@Override
public void updateTouchTracking(int interactionType) {
if (mInvalidated) {
return;
}
if (interactionType == INTERACTION_QUICK_SCRUB) {
ActivityManagerWrapper.getInstance()
.closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
mStartPending = true;
Runnable action = () -> {
@ -345,7 +357,6 @@ public class TouchInteractionService extends Service {
mQuickScrubController.onQuickScrubEnd();
mEndPending = false;
}
};
mActivityHelper.executeOnWindowAvailable(mActivity, action);