aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[automerger] Do not change state in the middle of quickstep gesture am: d936f6a5e9

Browse Source 
Change-Id: I6297797bb034ad8bd2600c8abb5a959ee0e6aa32
This commit is contained in:
Android Build Merger (Role)
2018-06-05 17:12:30 +00:00
parent 6e680f9bf6 d936f6a5e9
commit 7c8ffd1d3b
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
quickstep/src/com/android/quickstep/ActivityControlHelper.java
View File

@@ -243,9 +243,8 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> {
if (wasVisible) {
DeviceProfile dp = activity.getDeviceProfile();
long accuracy = 2 * Math.max(dp.widthPx, dp.heightPx);
activity.getStateManager().goToState(startState, false);
callback.accept(activity.getStateManager()
.createAnimationToNewWorkspace(endState, accuracy));
.createAnimationToNewWorkspace(startState, endState, accuracy));
return;
}

18
src/com/android/launcher3/LauncherStateManager.java
View File

@@ -296,6 +296,24 @@ public class LauncherStateManager {
}
}
/**
* Creates a {@link AnimatorPlaybackController} that can be used for a controlled
* state transition. The UI is force-set to fromState before creating the controller.
* @param fromState the initial state for the transition.
* @param state the final state for the transition.
* @param duration intended duration for normal playback. Use higher duration for better
* accuracy.
*/
public AnimatorPlaybackController createAnimationToNewWorkspace(
LauncherState fromState, LauncherState state, long duration) {
mConfig.reset();
for (StateHandler handler : getStateHandlers()) {
handler.setState(fromState);
}
return createAnimationToNewWorkspace(state, duration);
}
/**
* Creates a {@link AnimatorPlaybackController} that can be used for a controlled
* state transition.