Merge "Fix window transition when opening app from deep shortcut menu." into ub-launcher3-master (84450581) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -619,7 +619,13 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
		*/
		private ValueAnimator getWindowAnimators(View v, RemoteAnimationTargetCompat[] targets) {
		Rect bounds = new Rect();
		if (v instanceof BubbleTextView) {
		boolean isDeepShortcutTextView = v instanceof DeepShortcutTextView
		&& v.getParent() != null && v.getParent() instanceof DeepShortcutView;
		if (isDeepShortcutTextView) {
		// Deep shortcut views have their icon drawn in a sibling view.
		DeepShortcutView view = (DeepShortcutView) v.getParent();
		mDragLayer.getDescendantRectRelativeToSelf(view.getIconView(), bounds);
		} else if (v instanceof BubbleTextView) {
		((BubbleTextView) v).getIconBounds(bounds);
		} else {
		mDragLayer.getDescendantRectRelativeToSelf(v, bounds);