diff options
| author | Jon Miranda <jonmiranda@google.com> | 2019-05-15 10:43:00 -0700 |
|---|---|---|
| committer | Jon Miranda <jonmiranda@google.com> | 2019-05-15 10:46:33 -0700 |
| commit | ffaca2e1627c24cdfd529eb0ad9e5a88d8cd4633 (patch) | |
| tree | 9d6080f63273d5d71a2bffb6ad89a94daf3641ff /src | |
| parent | 0d1c0ab1bdbd526f1ac927a6d6b484b6eafc6576 (diff) | |
| download | android_packages_apps_Trebuchet-ffaca2e1627c24cdfd529eb0ad9e5a88d8cd4633.tar.gz android_packages_apps_Trebuchet-ffaca2e1627c24cdfd529eb0ad9e5a88d8cd4633.tar.bz2 android_packages_apps_Trebuchet-ffaca2e1627c24cdfd529eb0ad9e5a88d8cd4633.zip | |
Fix landscape app open/close animations.
Bug: 123900446
Bug: 124510042
Change-Id: I3db80d6f8064ce26f97cdede63c0d25499416e98
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/views/FloatingIconView.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java index dba02fc36..cb7bba73c 100644 --- a/src/com/android/launcher3/views/FloatingIconView.java +++ b/src/com/android/launcher3/views/FloatingIconView.java @@ -210,7 +210,12 @@ public class FloatingIconView extends View implements Math.max(shapeProgressStart, progress), shapeProgressStart, 1f, 0, toMax, LINEAR), 0, 1); - mOutline.bottom = (int) (rect.height() / scale); + if (mIsVerticalBarLayout) { + mOutline.right = (int) (rect.width() / scale); + } else { + mOutline.bottom = (int) (rect.height() / scale); + } + mTaskCornerRadius = cornerRadius / scale; if (mIsAdaptiveIcon) { if (!isOpening && shapeRevealProgress >= 0) { @@ -230,7 +235,8 @@ public class FloatingIconView extends View implements mRevealAnimator.setCurrentFraction(shapeRevealProgress); } - float drawableScale = mOutline.height() / minSize; + float drawableScale = (mIsVerticalBarLayout ? mOutline.width() : mOutline.height()) + / minSize; setBackgroundDrawableBounds(drawableScale); if (isOpening) { // Center align foreground |