diff options
author | Michael Jurka <mikejurka@google.com> | 2012-09-18 13:26:17 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-18 13:26:18 -0700 |
commit | 671a3a227c0ca880b0bf4ee93623efb61a4a6be5 (patch) | |
tree | 6445a92572359e0fd8d6c84b6dc8cc45a97ac954 /src | |
parent | 1190487e15325e371c6c18181b1a5ef7ab2a79e6 (diff) | |
parent | 82422503fdc8912968efef09dc1fc0fa2d9537cf (diff) | |
download | android_packages_apps_Trebuchet-671a3a227c0ca880b0bf4ee93623efb61a4a6be5.tar.gz android_packages_apps_Trebuchet-671a3a227c0ca880b0bf4ee93623efb61a4a6be5.tar.bz2 android_packages_apps_Trebuchet-671a3a227c0ca880b0bf4ee93623efb61a4a6be5.zip |
Merge "Fixing some warnings" into jb-mr1-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher2/Workspace.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 897e95a1f..cae002308 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -3697,13 +3697,12 @@ public class Workspace extends SmoothPagedView } // Clean up new-apps animation list - final LauncherModel model = mLauncher.getModel(); final Context context = getContext(); post(new Runnable() { @Override public void run() { String spKey = LauncherApplication.getSharedPreferencesKey(); - SharedPreferences sp = getContext().getSharedPreferences(spKey, + SharedPreferences sp = context.getSharedPreferences(spKey, Context.MODE_PRIVATE); Set<String> newApps = sp.getStringSet(InstallShortcutReceiver.NEW_APPS_LIST_KEY, null); @@ -3722,10 +3721,11 @@ public class Workspace extends SmoothPagedView // It is possible that we've queued an item to be loaded, yet it has // not been added to the workspace, so remove those items as well. - ArrayList<ItemInfo> shortcuts = - model.getWorkspaceShortcutItemInfosWithIntent(intent); + ArrayList<ItemInfo> shortcuts; + shortcuts = LauncherModel.getWorkspaceShortcutItemInfosWithIntent( + intent); for (ItemInfo info : shortcuts) { - model.deleteItemFromDatabase(context, info); + LauncherModel.deleteItemFromDatabase(context, info); } } catch (URISyntaxException e) {} } |