diff options
| author | Jonathan Miranda <jonmiranda@google.com> | 2016-12-15 19:36:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-15 19:36:40 +0000 |
| commit | 99d814e54b28efc8c8d8d6dec4bb036a380c3c3f (patch) | |
| tree | f4289a63a316ac121fe3cf362386de645d123ed7 /src/com/android/launcher3/CellLayout.java | |
| parent | 6c46a6d324310bd2fc0ea223c9782ba6394512e7 (diff) | |
| parent | 6f6a06ac470df4f58a6eea902b79a8813c44c8f7 (diff) | |
| download | packages_apps_Trebuchet-99d814e54b28efc8c8d8d6dec4bb036a380c3c3f.tar.gz packages_apps_Trebuchet-99d814e54b28efc8c8d8d6dec4bb036a380c3c3f.tar.bz2 packages_apps_Trebuchet-99d814e54b28efc8c8d8d6dec4bb036a380c3c3f.zip | |
Merge "Restore original scaleRectAboutCenter method." into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
| -rw-r--r-- | src/com/android/launcher3/CellLayout.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index aef94c1eb..1e212bfd8 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -1018,8 +1018,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { cellToRect(cellX, cellY, spanX, spanY, r); if (v instanceof LauncherAppWidgetHostView) { DeviceProfile profile = mLauncher.getDeviceProfile(); - Utilities.shrinkRectAboutCenter(r, profile.appWidgetScale.x, - profile.appWidgetScale.y); + Utilities.shrinkRect(r, profile.appWidgetScale.x, profile.appWidgetScale.y); } } else { // Find the top left corner of the rect the object will occupy @@ -1059,7 +1058,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { r.set(left, top, left + dragOutline.getWidth(), top + dragOutline.getHeight()); } - Utilities.shrinkRectAboutCenter(r, mChildScale, mChildScale); + Utilities.scaleRectAboutCenter(r, mChildScale); mDragOutlineAnims[mDragOutlineCurrent].setTag(dragOutline); mDragOutlineAnims[mDragOutlineCurrent].animateIn(); |