diff options
author | Daniel Sandler <dsandler@android.com> | 2013-06-11 14:45:48 -0400 |
---|---|---|
committer | Daniel Sandler <dsandler@android.com> | 2013-06-11 22:01:47 -0400 |
commit | cc8befac3550c81d04ea206c170adae36c9a6c93 (patch) | |
tree | 844f01e8fe09b157fb39d74b3195e934a3e6a271 /src/com/android/launcher3/InstallShortcutReceiver.java | |
parent | ecf33e4819d0c4b019706edd456ed14a6a0f200c (diff) | |
download | android_packages_apps_Trebuchet-cc8befac3550c81d04ea206c170adae36c9a6c93.tar.gz android_packages_apps_Trebuchet-cc8befac3550c81d04ea206c170adae36c9a6c93.tar.bz2 android_packages_apps_Trebuchet-cc8befac3550c81d04ea206c170adae36c9a6c93.zip |
Move LauncherApplication's state and code to LauncherAppState.
This removes Launcher's static data and other state out of
the Application object. Now LauncherApplication (extends
Application) exists only to instantiate LauncherAppState.
Change-Id: I4e323bd78b77536b92054105536a55c0c2c19ba8
Diffstat (limited to 'src/com/android/launcher3/InstallShortcutReceiver.java')
-rw-r--r-- | src/com/android/launcher3/InstallShortcutReceiver.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java index d61cec03d..07d68da35 100644 --- a/src/com/android/launcher3/InstallShortcutReceiver.java +++ b/src/com/android/launcher3/InstallShortcutReceiver.java @@ -204,7 +204,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver { info.icon = icon; info.iconResource = iconResource; if (mUseInstallQueue || launcherNotLoaded) { - String spKey = LauncherApplication.getSharedPreferencesKey(); + String spKey = LauncherAppState.getSharedPreferencesKey(); SharedPreferences sp = context.getSharedPreferences(spKey, Context.MODE_PRIVATE); addToInstallQueue(sp, info); } else { @@ -220,7 +220,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver { flushInstallQueue(context); } static void flushInstallQueue(Context context) { - String spKey = LauncherApplication.getSharedPreferencesKey(); + String spKey = LauncherAppState.getSharedPreferencesKey(); SharedPreferences sp = context.getSharedPreferences(spKey, Context.MODE_PRIVATE); ArrayList<PendingInstallShortcutInfo> installQueue = getAndClearInstallQueue(sp); Iterator<PendingInstallShortcutInfo> iter = installQueue.iterator(); @@ -231,7 +231,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver { private static void processInstallShortcut(Context context, PendingInstallShortcutInfo pendingInfo) { - String spKey = LauncherApplication.getSharedPreferencesKey(); + String spKey = LauncherAppState.getSharedPreferencesKey(); SharedPreferences sp = context.getSharedPreferences(spKey, Context.MODE_PRIVATE); final Intent data = pendingInfo.data; @@ -239,7 +239,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver { final String name = pendingInfo.name; // Lock on the app so that we don't try and get the items while apps are being added - LauncherApplication app = (LauncherApplication) context.getApplicationContext(); + LauncherAppState app = LauncherAppState.getInstance(); final int[] result = {INSTALL_SHORTCUT_SUCCESSFUL}; boolean found = false; synchronized (app) { @@ -313,7 +313,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver { }.start(); // Update the Launcher db - LauncherApplication app = (LauncherApplication) context.getApplicationContext(); + LauncherAppState app = LauncherAppState.getInstance(); ShortcutInfo info = app.getModel().addShortcut(context, data, LauncherSettings.Favorites.CONTAINER_DESKTOP, screen, tmpCoordinates[0], tmpCoordinates[1], true); |