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

[automerger] Cancelling quickscrub state incease we missed quickscrub end event am: 0fb1e4b5a7 

Change-Id: I0ba02df3d089cd26356aab32bd1f7a7249d1702f
This commit is contained in:
Android Build Merger (Role) 2018-05-25 18:39:46 +00:00
parent 08d9bb2d33 0fb1e4b5a7
commit 1b905daf5c
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
quickstep/src/com/android/launcher3/uioverrides/FastOverviewState.java
View File

@ -76,4 +76,10 @@ public class FastOverviewState extends OverviewState {
return Math.min(Math.min(dp.availableHeightPx / usedHeight,
dp.availableWidthPx / usedWidth), MAX_PREVIEW_SCALE_UP);
}
@Override
public void onStateDisabled(Launcher launcher) {
super.onStateDisabled(launcher);
launcher.<RecentsView>getOverviewPanel().getQuickScrubController().cancelActiveQuickscrub();
}
}

11
quickstep/src/com/android/quickstep/QuickScrubController.java
View File

@ -132,6 +132,17 @@ public class QuickScrubController implements OnAlarmListener {
}
}
public void cancelActiveQuickscrub() {
if (!mInQuickScrub) {
return;
}
Log.d(TAG, "Quickscrub was active, cancelling");
mInQuickScrub = false;
mActivityControlHelper = null;
mOnFinishedTransitionToQuickScrubRunnable = null;
mRecentsView.setNextPageSwitchRunnable(null);
}
/**
* Initializes the UI for quick scrub, returns true if success.
*/

1
quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
View File

@ -700,6 +700,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> {
mRecentsView.setRunningTaskHidden(false);
mRecentsView.setRunningTaskIconScaledDown(false /* isScaledDown */, false /* animate */);
mQuickScrubController.cancelActiveQuickscrub();
}
private void notifyTransitionCancelled() {