diff options
| author | Winson Chung <winsonc@google.com> | 2011-09-07 14:39:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-07 14:39:27 -0700 |
| commit | 75584788972c149730d7cae0642afdfdec44ba8d (patch) | |
| tree | d29fd9a7b68979b9674bcfe46d49d03cb6fcadf7 | |
| parent | 6c6f6f2009337ebfcc7f8fa3e5651d070ee2a9d7 (diff) | |
| parent | 36f9736cd3519e15ab54ba4f89573969e8e7bfe3 (diff) | |
| download | android_packages_apps_Trebuchet-75584788972c149730d7cae0642afdfdec44ba8d.tar.gz android_packages_apps_Trebuchet-75584788972c149730d7cae0642afdfdec44ba8d.tar.bz2 android_packages_apps_Trebuchet-75584788972c149730d7cae0642afdfdec44ba8d.zip | |
Merge "Loading the workspace favourites in reverse order to work around duplicate issue. (5208427)"
| -rw-r--r-- | src/com/android/launcher2/LauncherModel.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index e0b04dacb..c61607e72 100644 --- a/src/com/android/launcher2/LauncherModel.java +++ b/src/com/android/launcher2/LauncherModel.java @@ -949,9 +949,12 @@ public class LauncherModel extends BroadcastReceiver { final ArrayList<Long> itemsToRemove = new ArrayList<Long>(); final Cursor c = contentResolver.query( - LauncherSettings.Favorites.CONTENT_URI, null, null, null, null); + LauncherSettings.Favorites.CONTENT_URI, null, null, null, + LauncherSettings.Favorites._ID + " DESC"); // +1 for the hotseat (it can be larger than the workspace) + // Load workspace in reverse order to ensure that latest items are loaded first (and + // before any earlier duplicates) final ItemInfo occupied[][][] = new ItemInfo[Launcher.SCREEN_COUNT + 1][mCellCountX + 1][mCellCountY + 1]; |