diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-08-18 01:03:21 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2017-08-18 01:03:48 -0700 |
| commit | a9a1a210d3b8fac736555b133a815f463641b50e (patch) | |
| tree | 4e6615dcde9a39b07713aaa660ef9db00d163864 /src | |
| parent | b23980cc0e56b5d3f5ac0ca7714eca6479e502ae (diff) | |
| download | android_packages_apps_Trebuchet-a9a1a210d3b8fac736555b133a815f463641b50e.tar.gz android_packages_apps_Trebuchet-a9a1a210d3b8fac736555b133a815f463641b50e.tar.bz2 android_packages_apps_Trebuchet-a9a1a210d3b8fac736555b133a815f463641b50e.zip | |
Fixing crashloop due to ag/2750101
Change-Id: Idebf6bfad4e56a52780b848fbb09b3a0134ffdc2
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 0841f4fa8..28b44825d 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3328,7 +3328,7 @@ public class Launcher extends BaseActivity break; } case LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET: { - view = bindAppWidget((LauncherAppWidgetInfo) item); + view = inflateAppWidget((LauncherAppWidgetInfo) item); if (view == null) { continue; } @@ -3402,13 +3402,19 @@ public class Launcher extends BaseActivity /** * Add the views for a widget to the workspace. */ - public View bindAppWidget(LauncherAppWidgetInfo item) { + public void bindAppWidget(LauncherAppWidgetInfo item) { + View view = inflateAppWidget(item); + if (view != null) { + mWorkspace.addInScreen(view, item); + mWorkspace.requestLayout(); + } + } + + private View inflateAppWidget(LauncherAppWidgetInfo item) { if (mIsSafeModeEnabled) { PendingAppWidgetHostView view = new PendingAppWidgetHostView(this, item, mIconCache, true); prepareAppWidget(view, item); - mWorkspace.addInScreen(view, item); - mWorkspace.requestLayout(); return view; } @@ -3517,8 +3523,6 @@ public class Launcher extends BaseActivity view = new PendingAppWidgetHostView(this, item, mIconCache, false); } prepareAppWidget(view, item); - mWorkspace.addInScreen(view, item); - mWorkspace.requestLayout(); if (DEBUG_WIDGETS) { Log.d(TAG, "bound widget id="+item.appWidgetId+" in " |