Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5fb59fb authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Fixing loadWorkspace being called multiple times 

Using right intent when refreshing shortcut icons

Bug: 17662782
Bug: 17663766
Bug: 17569197
Change-Id: I8d698c5e2145b8412aff9978db4ec930d89f7f24
parent f876301d

src/com/android/launcher3/LauncherBackupHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }

src/com/android/launcher3/LauncherModel.java

+4 −4
Original line number Diff line number Diff line
@@ -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();

src/com/android/launcher3/ShortcutInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }