aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-28 15:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolved conflicts for merge of 9fc953b9 to ub-launcher3-master

Browse Source 
Change-Id: Ia3e845a2e336c846cceefdc2d1e8c6786753f1b1
This commit is contained in:
Sunny Goyal
2015-08-17 14:43:41 -07:00
parent 017a5c1e65 9fc953b94d
commit c268148f06
29 changed files with 86 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/launcher3/widget/WidgetHostViewLoader.java
View File

@@ -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);