diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-07-13 19:54:53 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-07-20 12:00:22 -0700 |
| commit | 53f9672b30b8a36bfae9f6492f732ccfb87723a4 (patch) | |
| tree | 6e5ec02530a2f15469135b15e28778104d5c2466 /src/com/android/launcher3/LauncherModel.java | |
| parent | e3fe3f89ee956e8d7995c569948cb70765ec19b8 (diff) | |
| download | android_packages_apps_Trebuchet-53f9672b30b8a36bfae9f6492f732ccfb87723a4.tar.gz android_packages_apps_Trebuchet-53f9672b30b8a36bfae9f6492f732ccfb87723a4.tar.bz2 android_packages_apps_Trebuchet-53f9672b30b8a36bfae9f6492f732ccfb87723a4.zip | |
Fixing widget restore
> Widget restore active flag was not cleared when the app was downloaded
> Icon from session info was not getting cached
Bug: 22413379
Change-Id: Ie096b929252200675a76dadd8c25cc3aa433671b
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index b60477fa0..0b67310fa 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -2163,7 +2163,11 @@ public class LauncherModel extends BroadcastReceiver appWidgetInfo = new LauncherAppWidgetInfo(appWidgetId, provider.provider); - int status = restoreStatus; + // The provider is available. So the widget is either + // available or not available. We do not need to track + // any future restore updates. + int status = restoreStatus & + ~LauncherAppWidgetInfo.FLAG_RESTORE_STARTED; if (!wasProviderReady) { // If provider was not previously ready, update the // status and UI flag. @@ -3155,7 +3159,9 @@ public class LauncherModel extends BroadcastReceiver if (mUser.equals(widgetInfo.user) && widgetInfo.hasRestoreFlag(LauncherAppWidgetInfo.FLAG_PROVIDER_NOT_READY) && packageSet.contains(widgetInfo.providerName.getPackageName())) { - widgetInfo.restoreStatus &= ~LauncherAppWidgetInfo.FLAG_PROVIDER_NOT_READY; + widgetInfo.restoreStatus &= + ~LauncherAppWidgetInfo.FLAG_PROVIDER_NOT_READY & + ~LauncherAppWidgetInfo.FLAG_RESTORE_STARTED; widgets.add(widgetInfo); updateItemInDatabase(context, widgetInfo); } |