summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJon Miranda <jonmiranda@google.com>2019-05-16 14:21:28 -0700
committerJon Miranda <jonmiranda@google.com>2019-05-16 14:21:28 -0700
commitc2968da3728006942cc105dc562ad04d907dfaea (patch)
tree4dda229bf2c9f949aabef1b402ea61b54aa3ea3e /src
parent5338e0540bc90e9811c5485aa33a32cd64368987 (diff)
downloadandroid_packages_apps_Trebuchet-c2968da3728006942cc105dc562ad04d907dfaea.tar.gz
android_packages_apps_Trebuchet-c2968da3728006942cc105dc562ad04d907dfaea.tar.bz2
android_packages_apps_Trebuchet-c2968da3728006942cc105dc562ad04d907dfaea.zip
Fix bug where FloatingIconView did not use IconShape normalization scale.
This fix allows for a clean tradeoff between the FIV and the original icon in all icon shapes. Bug: 130292844 Change-Id: Ief2eec2673161e0f9d32d8710713a1f01880040d
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/views/FloatingIconView.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index cb7bba73c..e5c75c3fc 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -441,7 +441,8 @@ public class FloatingIconView extends View implements
}
if (!isFolderIcon) {
- mStartRevealRect.inset(mBlurSizeOutline, mBlurSizeOutline);
+ Utilities.scaleRectAboutCenter(mStartRevealRect,
+ IconShape.getNormalizationScale());
}
float aspectRatio = mLauncher.getDeviceProfile().aspectRatio;