aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 03:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fixing crash when dragging and dropping a restored widget." into ub-launcher3-almonte

Browse Source
This commit is contained in:
Sunny Goyal
2015-02-17 20:34:55 +00:00
committed by Android (Google) Code Review
parent 80e6beb48c 2434d40ef2
commit fce720f39a
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/launcher3/LauncherAppWidgetHostView.java
View File

@@ -145,9 +145,9 @@ public class LauncherAppWidgetHostView extends AppWidgetHostView implements Touc
@Override
public AppWidgetProviderInfo getAppWidgetInfo() {
AppWidgetProviderInfo info = super.getAppWidgetInfo();
if (!(info instanceof LauncherAppWidgetProviderInfo)) {
if (info != null && !(info instanceof LauncherAppWidgetProviderInfo)) {
throw new IllegalStateException("Launcher widget must have"
+ "LauncherAppWidgetProviderInfo");
+ " LauncherAppWidgetProviderInfo");
}
return info;
}

5
src/com/android/launcher3/Workspace.java
View File

@@ -3177,9 +3177,8 @@ public class Workspace extends SmoothPagedView
// in its final location
final LauncherAppWidgetHostView hostView = (LauncherAppWidgetHostView) cell;
LauncherAppWidgetProviderInfo pInfo = (LauncherAppWidgetProviderInfo)
hostView.getAppWidgetInfo();
if (pInfo.resizeMode != AppWidgetProviderInfo.RESIZE_NONE) {
AppWidgetProviderInfo pInfo = hostView.getAppWidgetInfo();
if (pInfo != null && pInfo.resizeMode != AppWidgetProviderInfo.RESIZE_NONE) {
final Runnable addResizeFrame = new Runnable() {
public void run() {
DragLayer dragLayer = mLauncher.getDragLayer();