Merge "FreeformHandler should just intercept, not claim animations" into tm-qpr-dev
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionHandler.java
index 20d7725..af205ed 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionHandler.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionHandler.java
@@ -122,7 +122,6 @@
break;
case WindowManager.TRANSIT_TO_BACK:
case WindowManager.TRANSIT_TO_FRONT:
- transitionHandled = true;
break;
}
}
@@ -147,7 +146,9 @@
return false;
}
mFreeformTaskListener.createWindowDecoration(change, startT, finishT);
- return true;
+
+ // Intercepted transition to manage the window decorations. Let other handlers animate.
+ return false;
}
private boolean startCloseTransition(
@@ -164,7 +165,8 @@
windowDecors.add(windowDecor);
}
- return true;
+ // Intercepted transition to manage the window decorations. Let other handlers animate.
+ return false;
}
private boolean startChangeTransition(