diff options
| author | Winson Chung <winsonc@google.com> | 2015-06-12 20:00:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-12 20:00:47 +0000 |
| commit | 0d95bf1a0c035f2ef9681a7c9a3d46aca74f3c11 (patch) | |
| tree | e565f6de3112b873488e459994fa9f29d2a887ae /src/com/android | |
| parent | 51cd50d7f1649f4bdea42483503810735555868e (diff) | |
| parent | 4eda8048c1705a716e8f2b9ddaf026a8a8b03863 (diff) | |
| download | android_packages_apps_Trebuchet-0d95bf1a0c035f2ef9681a7c9a3d46aca74f3c11.tar.gz android_packages_apps_Trebuchet-0d95bf1a0c035f2ef9681a7c9a3d46aca74f3c11.tar.bz2 android_packages_apps_Trebuchet-0d95bf1a0c035f2ef9681a7c9a3d46aca74f3c11.zip | |
Merge "Fixing issue with click shadow not being drawn correctly." into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher3/ClickShadowView.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher3/ClickShadowView.java b/src/com/android/launcher3/ClickShadowView.java index 42fafe275..e31d7f7f6 100644 --- a/src/com/android/launcher3/ClickShadowView.java +++ b/src/com/android/launcher3/ClickShadowView.java @@ -96,12 +96,14 @@ public class ClickShadowView extends View { float drawableWidth = view.getIcon().getBounds().width(); setTranslationX(leftShift + + viewParent.getTranslationX() + view.getCompoundPaddingLeft() * view.getScaleX() + (iconHSpace - drawableWidth) * view.getScaleX() / 2 /* drawable gap */ + iconWidth * (1 - view.getScaleX()) / 2 /* gap due to scale */ - mShadowPadding /* extra shadow size */ ); setTranslationY(topShift + + viewParent.getTranslationY() + view.getPaddingTop() * view.getScaleY() /* drawable gap */ + view.getHeight() * (1 - view.getScaleY()) / 2 /* gap due to scale */ - mShadowPadding /* extra shadow size */ |