diff options
| author | Tony Wickham <twickham@google.com> | 2015-12-04 14:21:19 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-04 14:21:19 -0800 |
| commit | 11c45f114165330ea9c895ca6fdf83fdaa2e5fad (patch) | |
| tree | ad7606d0d7309af50df5bacf10cf404d6c490445 /src/com/android/launcher3/ShortcutAndWidgetContainer.java | |
| parent | 92b3397711a05481793ea71b7d90da8813feda7a (diff) | |
| parent | 8db5d7ca60e79f007bfce7952c15c74d0ee44bc0 (diff) | |
| download | android_packages_apps_Trebuchet-11c45f114165330ea9c895ca6fdf83fdaa2e5fad.tar.gz android_packages_apps_Trebuchet-11c45f114165330ea9c895ca6fdf83fdaa2e5fad.tar.bz2 android_packages_apps_Trebuchet-11c45f114165330ea9c895ca6fdf83fdaa2e5fad.zip | |
Merge "Add appropriate (tiny) offset to widget drops so they land correctly." into ub-launcher3-burnaby-polish
am: 8db5d7ca60
* commit '8db5d7ca60e79f007bfce7952c15c74d0ee44bc0':
Add appropriate (tiny) offset to widget drops so they land correctly.
Diffstat (limited to 'src/com/android/launcher3/ShortcutAndWidgetContainer.java')
| -rw-r--r-- | src/com/android/launcher3/ShortcutAndWidgetContainer.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/launcher3/ShortcutAndWidgetContainer.java b/src/com/android/launcher3/ShortcutAndWidgetContainer.java index 20c27735e..008dd847e 100644 --- a/src/com/android/launcher3/ShortcutAndWidgetContainer.java +++ b/src/com/android/launcher3/ShortcutAndWidgetContainer.java @@ -141,8 +141,7 @@ public class ShortcutAndWidgetContainer extends ViewGroup { lp.height = getMeasuredHeight(); } int childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(lp.width, MeasureSpec.EXACTLY); - int childheightMeasureSpec = MeasureSpec.makeMeasureSpec(lp.height, - MeasureSpec.EXACTLY); + int childheightMeasureSpec = MeasureSpec.makeMeasureSpec(lp.height, MeasureSpec.EXACTLY); child.measure(childWidthMeasureSpec, childheightMeasureSpec); } |