diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-08-04 10:33:30 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-08-04 10:33:30 -0700 |
| commit | 3c938a7e0dfa6289bba557164f629873a230bd5c (patch) | |
| tree | 18979a36705a89414207fba10c489cae6a80be94 /src/com/android/launcher3/AppWidgetResizeFrame.java | |
| parent | 488d4bdf26fb8cefd4f2f83535fde1b07202b545 (diff) | |
| parent | 3f7550c1edb2a8db85e2c2db4333c9cd458e259b (diff) | |
| download | android_packages_apps_Trebuchet-3c938a7e0dfa6289bba557164f629873a230bd5c.tar.gz android_packages_apps_Trebuchet-3c938a7e0dfa6289bba557164f629873a230bd5c.tar.bz2 android_packages_apps_Trebuchet-3c938a7e0dfa6289bba557164f629873a230bd5c.zip | |
resolved conflicts for merge of 3f7550c1 to ub-launcher3-master
Change-Id: I3bb155473d48832e496a8983f84c20e6e935fa41
Diffstat (limited to 'src/com/android/launcher3/AppWidgetResizeFrame.java')
| -rw-r--r-- | src/com/android/launcher3/AppWidgetResizeFrame.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java index 459b6b9d9..c87074d16 100644 --- a/src/com/android/launcher3/AppWidgetResizeFrame.java +++ b/src/com/android/launcher3/AppWidgetResizeFrame.java @@ -75,8 +75,8 @@ public class AppWidgetResizeFrame extends FrameLayout { mResizeMode = info.resizeMode; mDragLayer = dragLayer; - mMinHSpan = info.getMinSpanX(mLauncher); - mMinVSpan = info.getMinSpanY(mLauncher); + mMinHSpan = info.minSpanX; + mMinVSpan = info.minSpanY; setBackgroundResource(R.drawable.widget_resize_shadow); setForeground(getResources().getDrawable(R.drawable.widget_resize_frame)); |