summaryrefslogtreecommitdiffstats
path: root/quickstep
diff options
context:
space:
mode:
authorJon Miranda <jonmiranda@google.com>2018-03-13 09:23:50 -0700
committerJon Miranda <jonmiranda@google.com>2018-03-13 09:23:50 -0700
commit79d9b632efc0fcf7ba671368f0e5e6abcc3d9468 (patch)
tree918c6a5426135a836f90a96fdb62c580b1e53e2c /quickstep
parent446aa8c1229b56872aceccb66109dcfbe214e6c0 (diff)
downloadandroid_packages_apps_Trebuchet-79d9b632efc0fcf7ba671368f0e5e6abcc3d9468.tar.gz
android_packages_apps_Trebuchet-79d9b632efc0fcf7ba671368f0e5e6abcc3d9468.tar.bz2
android_packages_apps_Trebuchet-79d9b632efc0fcf7ba671368f0e5e6abcc3d9468.zip
Fix window transition when opening app from deep shortcut menu.
Bug: 74109370 Change-Id: I10bbc6d6dd2ead1f4649830795af5d84a346073e
Diffstat (limited to 'quickstep')
-rw-r--r--quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
index b97669bf3..14232ae4e 100644
--- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
@@ -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);