summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/ClickShadowView.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-06-12 12:54:31 -0700
committerWinson Chung <winsonc@google.com>2015-06-12 12:55:22 -0700
commit4eda8048c1705a716e8f2b9ddaf026a8a8b03863 (patch)
tree7705ee447c0abf9229a19ea0c087db8a019d13ef /src/com/android/launcher3/ClickShadowView.java
parente89cf793ab22fcb8cea3ff94ca981659208446db (diff)
downloadandroid_packages_apps_Trebuchet-4eda8048c1705a716e8f2b9ddaf026a8a8b03863.tar.gz
android_packages_apps_Trebuchet-4eda8048c1705a716e8f2b9ddaf026a8a8b03863.tar.bz2
android_packages_apps_Trebuchet-4eda8048c1705a716e8f2b9ddaf026a8a8b03863.zip
Fixing issue with click shadow not being drawn correctly.
- It was due to the view parent (prediction bar) which has its own translation.
Diffstat (limited to 'src/com/android/launcher3/ClickShadowView.java')
-rw-r--r--src/com/android/launcher3/ClickShadowView.java2
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 */