openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'goog/cupcake'

This commit is contained in:
The Android Open Source Project 2009-03-27 18:48:33 -07:00
parent 2e6a82faa9 bcc7c577d3
commit ddf2204161
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/launcher/LauncherModel.java
View File

@ -584,6 +584,7 @@ public class LauncherModel {
} }
if (mDesktopItemsLoader != null && mDesktopItemsLoader.isRunning()) { if (mDesktopItemsLoader != null && mDesktopItemsLoader.isRunning()) {
if (DEBUG_LOADERS) d(LOG_TAG, " --> stopping workspace loader");
mDesktopItemsLoader.stop(); mDesktopItemsLoader.stop();
// Wait for the currently running thread to finish, this can take a little // Wait for the currently running thread to finish, this can take a little
// time but it should be well below the timeout limit // time but it should be well below the timeout limit
@ -592,6 +593,13 @@ public class LauncherModel {
} catch (InterruptedException e) { } catch (InterruptedException e) {
// Empty // Empty
} }
// If the thread we are interrupting was tasked to load the list of
// applications make sure we keep that information in the new loader
// spawned below
// note: we don't apply this to localeChanged because the thread can
// only be stopped *after* the localeChanged handling has occured
loadApplications = mDesktopItemsLoader.mLoadApplications;
} }
if (DEBUG_LOADERS) d(LOG_TAG, " --> starting workspace loader"); if (DEBUG_LOADERS) d(LOG_TAG, " --> starting workspace loader");
@ -636,7 +644,8 @@ public class LauncherModel {
final ContentValues values = new ContentValues(); final ContentValues values = new ContentValues();
values.put(LauncherSettings.Favorites.TITLE, label); values.put(LauncherSettings.Favorites.TITLE, label);
resolver.update(LauncherSettings.Favorites.CONTENT_URI_NO_NOTIFICATION, resolver.update(
LauncherSettings.Favorites.CONTENT_URI_NO_NOTIFICATION,
values, "_id=?", values, "_id=?",
new String[] { String.valueOf(c.getLong(idIndex)) }); new String[] { String.valueOf(c.getLong(idIndex)) });
@ -1243,7 +1252,7 @@ public class LauncherModel {
FolderInfo getFolderById(Context context, long id) { FolderInfo getFolderById(Context context, long id) {
final ContentResolver cr = context.getContentResolver(); final ContentResolver cr = context.getContentResolver();
Cursor c = cr.query(LauncherSettings.Favorites.CONTENT_URI, null, Cursor c = cr.query(LauncherSettings.Favorites.CONTENT_URI, null,
"_id=? and itemType=? or itemType=?", "_id=? and (itemType=? or itemType=?)",
new String[] { String.valueOf(id), new String[] { String.valueOf(id),
String.valueOf(LauncherSettings.Favorites.ITEM_TYPE_USER_FOLDER), String.valueOf(LauncherSettings.Favorites.ITEM_TYPE_USER_FOLDER),
String.valueOf(LauncherSettings.Favorites.ITEM_TYPE_LIVE_FOLDER) }, null); String.valueOf(LauncherSettings.Favorites.ITEM_TYPE_LIVE_FOLDER) }, null);