diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-09-25 16:20:38 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2014-09-26 01:07:11 +0000 |
| commit | c5fb59fb9a36180ce962f565d85aa92f9991da1a (patch) | |
| tree | f4ce966a5f15f9a5fcaab77b4fc9ada015e76490 | |
| parent | f876301d0a460bec260a3c7a6ab260a06d5817ba (diff) | |
| download | android_packages_apps_Trebuchet-c5fb59fb9a36180ce962f565d85aa92f9991da1a.tar.gz android_packages_apps_Trebuchet-c5fb59fb9a36180ce962f565d85aa92f9991da1a.tar.bz2 android_packages_apps_Trebuchet-c5fb59fb9a36180ce962f565d85aa92f9991da1a.zip | |
Fixing loadWorkspace being called multiple times
Using right intent when refreshing shortcut icons
Bug: 17662782
Bug: 17663766
Bug: 17569197
Change-Id: I8d698c5e2145b8412aff9978db4ec930d89f7f24
| -rw-r--r-- | src/com/android/launcher3/LauncherBackupHelper.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 8 | ||||
| -rw-r--r-- | src/com/android/launcher3/ShortcutInfo.java | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java index 1ea562b3f..911a41dca 100644 --- a/src/com/android/launcher3/LauncherBackupHelper.java +++ b/src/com/android/launcher3/LauncherBackupHelper.java @@ -354,7 +354,7 @@ public class LauncherBackupHelper implements BackupHelper { try { ContentResolver cr = mContext.getContentResolver(); ContentValues values = unpackFavorite(buffer, 0, dataSize); - cr.insert(Favorites.CONTENT_URI, values); + cr.insert(Favorites.CONTENT_URI_NO_NOTIFICATION, values); } catch (InvalidProtocolBufferNanoException e) { Log.e(TAG, "failed to decode favorite", e); } diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index d2cf8f50b..dd948916b 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1905,7 +1905,7 @@ public class LauncherModel extends BroadcastReceiver final ArrayList<Long> itemsToRemove = new ArrayList<Long>(); final ArrayList<Long> restoredRows = new ArrayList<Long>(); - final Uri contentUri = LauncherSettings.Favorites.CONTENT_URI; + final Uri contentUri = LauncherSettings.Favorites.CONTENT_URI_NO_NOTIFICATION; if (DEBUG_LOADERS) Log.d(TAG, "loading model from " + contentUri); final Cursor c = contentResolver.query(contentUri, null, null, null, null); @@ -2265,7 +2265,7 @@ public class LauncherModel extends BroadcastReceiver LauncherAppWidgetInfo.FLAG_RESTORE_STARTED; } else if (REMOVE_UNRESTORED_ICONS) { Launcher.addDumpLog(TAG, - "Unrestored package removed: " + component, true); + "Unrestored widget removed: " + component, true); itemsToRemove.add(id); continue; } @@ -2332,7 +2332,7 @@ public class LauncherModel extends BroadcastReceiver if (itemsToRemove.size() > 0) { ContentProviderClient client = contentResolver.acquireContentProviderClient( - LauncherSettings.Favorites.CONTENT_URI); + contentUri); // Remove dead items for (long id : itemsToRemove) { if (DEBUG_LOADERS) { @@ -2350,7 +2350,7 @@ public class LauncherModel extends BroadcastReceiver if (restoredRows.size() > 0) { ContentProviderClient updater = contentResolver.acquireContentProviderClient( - LauncherSettings.Favorites.CONTENT_URI); + contentUri); // Update restored items that no longer require special handling try { StringBuilder selectionBuilder = new StringBuilder(); diff --git a/src/com/android/launcher3/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java index 5b27f845e..daf343460 100644 --- a/src/com/android/launcher3/ShortcutInfo.java +++ b/src/com/android/launcher3/ShortcutInfo.java @@ -174,7 +174,7 @@ public class ShortcutInfo extends ItemInfo { } public void updateIcon(IconCache iconCache) { - mIcon = iconCache.getIcon(intent, user); + mIcon = iconCache.getIcon(promisedIntent != null ? promisedIntent : intent, user); usingFallbackIcon = iconCache.isDefaultIcon(mIcon, user); } |