PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge changes I0b96f623,I019084a1 into ub-launcher3-qt-dev

Browse Source 
am: 503f46185a

Change-Id: I920fc80aa61b89814c5873339be744ea4c6af0b9
This commit is contained in:
Tony Wickham
2019-06-12 10:57:33 -07:00
committed by android-build-merger
parent de359dd64a 503f46185a
commit 4ac2a3668b
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+1 -1
View File
@@ -619,7 +619,7 @@ public class TouchInteractionService extends Service implements
return InputConsumer.NO_OP;
}
if (activity.getRootView().hasWindowFocus()) {
if (activity.getRootView().hasWindowFocus() || mSwipeSharedState.goingToLauncher) {
return new OverviewInputConsumer(activity, mInputMonitorCompat,
false /* startingInActivityBounds */);
} else {
quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
+2 -3
View File
@@ -868,9 +868,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
@UiThread
private InputConsumer createNewInputProxyHandler() {
endRunningWindowAnim();
if (mLauncherTransitionController != null) {
mLauncherTransitionController.getAnimationPlayer().end();
}
endLauncherTransitionController();
if (!ENABLE_QUICKSTEP_LIVE_TILE.get()) {
// Hide the task view, if not already hidden
setTargetAlphaProvider(WindowTransformSwipeHandler::getHiddenTargetAlpha);
@@ -1312,6 +1310,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
}
private void endLauncherTransitionController() {
setShelfState(ShelfAnimState.CANCEL, LINEAR, 0);
if (mLauncherTransitionController != null) {
mLauncherTransitionController.getAnimationPlayer().end();
mLauncherTransitionController = null;