diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-08-17 14:43:41 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-08-17 14:43:41 -0700 |
| commit | c268148f06f5c6c30deb1678e74530ef5aa85a67 (patch) | |
| tree | ee179b0e3dd08c1c158e9dd761b10dd75fe37e0f /src/com/android/launcher3/widget/WidgetHostViewLoader.java | |
| parent | 017a5c1e6524a0b93b7fdec1de7a49aaf1d04852 (diff) | |
| parent | 9fc953b94dbc6b99e6de08c9dcc80a0cb8e3e319 (diff) | |
| download | android_packages_apps_Trebuchet-c268148f06f5c6c30deb1678e74530ef5aa85a67.tar.gz android_packages_apps_Trebuchet-c268148f06f5c6c30deb1678e74530ef5aa85a67.tar.bz2 android_packages_apps_Trebuchet-c268148f06f5c6c30deb1678e74530ef5aa85a67.zip | |
resolved conflicts for merge of 9fc953b9 to ub-launcher3-master
Change-Id: Ia3e845a2e336c846cceefdc2d1e8c6786753f1b1
Diffstat (limited to 'src/com/android/launcher3/widget/WidgetHostViewLoader.java')
| -rw-r--r-- | src/com/android/launcher3/widget/WidgetHostViewLoader.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/widget/WidgetHostViewLoader.java b/src/com/android/launcher3/widget/WidgetHostViewLoader.java index bdd117c73..1966f9fdc 100644 --- a/src/com/android/launcher3/widget/WidgetHostViewLoader.java +++ b/src/com/android/launcher3/widget/WidgetHostViewLoader.java @@ -16,6 +16,7 @@ import com.android.launcher3.DragSource; import com.android.launcher3.ItemInfo; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppWidgetProviderInfo; +import com.android.launcher3.Utilities; import com.android.launcher3.compat.AppWidgetManagerCompat; import com.android.launcher3.util.Thunk; @@ -132,7 +133,7 @@ public class WidgetHostViewLoader implements DragListener { public static Bundle getDefaultOptionsForWidget(Launcher launcher, PendingAddWidgetInfo info) { Bundle options = null; Rect rect = new Rect(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { + if (Utilities.ATLEAST_JB_MR1) { AppWidgetResizeFrame.getWidgetSizeRanges(launcher, info.spanX, info.spanY, rect); Rect padding = AppWidgetHostView.getDefaultPaddingForWidget(launcher, info.componentName, null); |