Merge changes Ib95f0c41,I5a1488aa into ub-launcher3-master
* changes:
Start the recents window animation on touch down.
Only keep running task id.
diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
index 6289bc1..31c195d 100644
--- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
@@ -471,14 +471,14 @@
float dX = getValue(0, endX, 0, 350, currentPlayTime,
Interpolators.AGGRESSIVE_EASE_IN_OUT);
+ float dY = (height - height * scale) / 2f;
TransactionCompat t = new TransactionCompat();
for (RemoteAnimationTargetCompat app : targets) {
if (app.mode == RemoteAnimationTargetCompat.MODE_CLOSING) {
t.setAlpha(app.leash, 1f - percent);
-
- float dY = (height - (app.clipRect.height() * scale)) / 2f;
matrix.postTranslate(dX, dY);
+ matrix.postTranslate(app.position.x, app.position.y);
t.setMatrix(app.leash, matrix);
}
// TODO: Layer should be set only once, but there is possibly a race condition
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index c1883b1..85443ed 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -408,9 +408,7 @@
mAppTransitionManager = Utilities.getOverrideObject(LauncherAppTransitionManager.class,
this, R.string.app_transition_manager_class);
- if (!isInMultiWindowModeCompat()) {
- mAppTransitionManager.registerRemoteAnimations();
- }
+ mAppTransitionManager.registerRemoteAnimations();
if (mLauncherCallbacks != null) {
mLauncherCallbacks.onCreate(savedInstanceState);