From 36f9736cd3519e15ab54ba4f89573969e8e7bfe3 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Wed, 7 Sep 2011 11:20:10 -0700 Subject: Loading the workspace favourites in reverse order to work around duplicate issue. (5208427) Change-Id: I87dee7a9aab345740f51d8168c6b073a93e20652 --- src/com/android/launcher2/LauncherModel.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') 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 itemsToRemove = new ArrayList(); 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]; -- cgit v1.2.3