diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-12-16 15:04:51 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-12-16 15:05:09 -0800 |
commit | a52ecb0390c85afb385371bb844bb496c59ddf87 (patch) | |
tree | a3a0a6fff80e059a0a10181fb74164aa3e642758 /src/com/android/launcher3/widget/WidgetHostViewLoader.java | |
parent | 90a40570bc54506979d3610ee331deacfa7300ec (diff) | |
download | android_packages_apps_Trebuchet-a52ecb0390c85afb385371bb844bb496c59ddf87.tar.gz android_packages_apps_Trebuchet-a52ecb0390c85afb385371bb844bb496c59ddf87.tar.bz2 android_packages_apps_Trebuchet-a52ecb0390c85afb385371bb844bb496c59ddf87.zip |
Removing all compatibility code below Lollipop
Bug: 32745285
Change-Id: I62971908e3e4402941fab627bbdfd47be64473a3
Diffstat (limited to 'src/com/android/launcher3/widget/WidgetHostViewLoader.java')
-rw-r--r-- | src/com/android/launcher3/widget/WidgetHostViewLoader.java | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/src/com/android/launcher3/widget/WidgetHostViewLoader.java b/src/com/android/launcher3/widget/WidgetHostViewLoader.java index b19605336..56112b21e 100644 --- a/src/com/android/launcher3/widget/WidgetHostViewLoader.java +++ b/src/com/android/launcher3/widget/WidgetHostViewLoader.java @@ -10,12 +10,9 @@ import android.util.Log; import android.view.View; import com.android.launcher3.AppWidgetResizeFrame; -import com.android.launcher3.DragSource; import com.android.launcher3.DropTarget; -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.dragndrop.DragController; import com.android.launcher3.dragndrop.DragLayer; @@ -154,27 +151,24 @@ public class WidgetHostViewLoader implements DragController.DragListener { } public static Bundle getDefaultOptionsForWidget(Context context, PendingAddWidgetInfo info) { - Bundle options = null; - if (Utilities.ATLEAST_JB_MR1) { - Rect rect = new Rect(); - AppWidgetResizeFrame.getWidgetSizeRanges(context, info.spanX, info.spanY, rect); - Rect padding = AppWidgetHostView.getDefaultPaddingForWidget(context, - info.componentName, null); - - float density = context.getResources().getDisplayMetrics().density; - int xPaddingDips = (int) ((padding.left + padding.right) / density); - int yPaddingDips = (int) ((padding.top + padding.bottom) / density); - - options = new Bundle(); - options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, - rect.left - xPaddingDips); - options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, - rect.top - yPaddingDips); - options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, - rect.right - xPaddingDips); - options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, - rect.bottom - yPaddingDips); - } + Rect rect = new Rect(); + AppWidgetResizeFrame.getWidgetSizeRanges(context, info.spanX, info.spanY, rect); + Rect padding = AppWidgetHostView.getDefaultPaddingForWidget(context, + info.componentName, null); + + float density = context.getResources().getDisplayMetrics().density; + int xPaddingDips = (int) ((padding.left + padding.right) / density); + int yPaddingDips = (int) ((padding.top + padding.bottom) / density); + + Bundle options = new Bundle(); + options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, + rect.left - xPaddingDips); + options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, + rect.top - yPaddingDips); + options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, + rect.right - xPaddingDips); + options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, + rect.bottom - yPaddingDips); return options; } } |