diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2019-06-05 19:54:59 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-05 19:54:59 -0700 |
| commit | 5db7cb9c2db309c95256bacd2a8acb8175bb9da0 (patch) | |
| tree | f928ab607c6d26fc8b73e3c9847129c9842be3dc /src | |
| parent | be8f7d2845db759c689039abadd2dd7b9f930924 (diff) | |
| parent | bfaabbea8150b630bc6b6dd6a98f13a408619cdf (diff) | |
| download | android_packages_apps_Trebuchet-5db7cb9c2db309c95256bacd2a8acb8175bb9da0.tar.gz android_packages_apps_Trebuchet-5db7cb9c2db309c95256bacd2a8acb8175bb9da0.tar.bz2 android_packages_apps_Trebuchet-5db7cb9c2db309c95256bacd2a8acb8175bb9da0.zip | |
Merge "Fixing wrong origin when launching new task from overview" into ub-launcher3-qt-dev
am: bfaabbea81
Change-Id: Ie0939ae8c5286631da3ef08ffaf0151bdc81c7e6
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/views/FloatingIconView.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java index 95c96817a..339681cd6 100644 --- a/src/com/android/launcher3/views/FloatingIconView.java +++ b/src/com/android/launcher3/views/FloatingIconView.java @@ -124,6 +124,7 @@ public class FloatingIconView extends View implements private boolean mIsVerticalBarLayout = false; private boolean mIsAdaptiveIcon = false; + private boolean mIsOpening; private @Nullable Drawable mBadge; private @Nullable Drawable mForeground; @@ -178,8 +179,10 @@ public class FloatingIconView extends View implements @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); - getViewTreeObserver().addOnGlobalLayoutListener(this); - mLauncher.getRotationHelper().setCurrentTransitionRequest(REQUEST_LOCK); + if (!mIsOpening) { + getViewTreeObserver().addOnGlobalLayoutListener(this); + mLauncher.getRotationHelper().setCurrentTransitionRequest(REQUEST_LOCK); + } } @Override @@ -326,7 +329,7 @@ public class FloatingIconView extends View implements * - For BubbleTextView, we return the icon bounds. */ private float getLocationBoundsForView(View v, RectF outRect) { - boolean ignoreTransform = true; + boolean ignoreTransform = !mIsOpening; if (v instanceof DeepShortcutView) { v = ((DeepShortcutView) v).getBubbleText(); ignoreTransform = false; @@ -627,6 +630,7 @@ public class FloatingIconView extends View implements view.recycle(); view.mIsVerticalBarLayout = launcher.getDeviceProfile().isVerticalBarLayout(); + view.mIsOpening = isOpening; view.mOriginalIcon = originalView; view.mPositionOut = positionOut; |