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

am c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons

Browse Source 
* commit 'c5fb59fb9a36180ce962f565d85aa92f9991da1a':
  Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons
This commit is contained in:
Sunny Goyal
2014-09-26 10:07:36 +00:00
committed by Android Git Automerger
parent e9461be3cf c5fb59fb9a
commit fdff96d385
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/launcher3/LauncherBackupHelper.java
View File

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

8
src/com/android/launcher3/LauncherModel.java
View File

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

2
src/com/android/launcher3/ShortcutInfo.java
View File

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