diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-11-21 16:02:39 +0530 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-11-21 22:28:23 +0530 |
commit | dde4fd971e825749686e7aa77379c65e410eea54 (patch) | |
tree | f23e94c8931b2052d910f0dcba1b0d87a36305f1 /src/com/android/launcher3/model | |
parent | aa8a871e337fe42e9339b96833eaf37bf2b64b2f (diff) | |
download | android_packages_apps_Trebuchet-dde4fd971e825749686e7aa77379c65e410eea54.tar.gz android_packages_apps_Trebuchet-dde4fd971e825749686e7aa77379c65e410eea54.tar.bz2 android_packages_apps_Trebuchet-dde4fd971e825749686e7aa77379c65e410eea54.zip |
Changing DeepShortcutManager to have a singleton contructor instead
of getting it from LauncherAppState
This follows the design of other managers and makes it easier to access it
from other processes and non-ui thread.
Bug: 33032833
Change-Id: I8ad82ae5b6cc47bae885f9896985675c7dd0d5b8
Diffstat (limited to 'src/com/android/launcher3/model')
3 files changed, 7 insertions, 6 deletions
diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java index c18eeef3d..29defdd08 100644 --- a/src/com/android/launcher3/model/BgDataModel.java +++ b/src/com/android/launcher3/model/BgDataModel.java @@ -26,6 +26,7 @@ import com.android.launcher3.LauncherSettings; import com.android.launcher3.ShortcutInfo; import com.android.launcher3.compat.UserHandleCompat; import com.android.launcher3.config.ProviderConfig; +import com.android.launcher3.shortcuts.DeepShortcutManager; import com.android.launcher3.shortcuts.ShortcutInfoCompat; import com.android.launcher3.shortcuts.ShortcutKey; import com.android.launcher3.util.ComponentKey; @@ -123,8 +124,8 @@ public class BgDataModel { ShortcutKey pinnedShortcut = ShortcutKey.fromShortcutInfo((ShortcutInfo) item); MutableInt count = pinnedShortcutCounts.get(pinnedShortcut); if (count == null || --count.value == 0) { - LauncherAppState.getInstance() - .getShortcutManager().unpinShortcut(pinnedShortcut); + DeepShortcutManager.getInstance(LauncherAppState.getInstance().getContext()) + .unpinShortcut(pinnedShortcut); } // Fall through. } @@ -161,7 +162,7 @@ public class BgDataModel { // Since this is a new item, pin the shortcut in the system server. if (newItem && count.value == 1) { - LauncherAppState.getInstance().getShortcutManager() + DeepShortcutManager.getInstance(LauncherAppState.getInstance().getContext()) .pinShortcut(pinnedShortcut); } // Fall through diff --git a/src/com/android/launcher3/model/ShortcutsChangedTask.java b/src/com/android/launcher3/model/ShortcutsChangedTask.java index 8f7c21db0..3314353b7 100644 --- a/src/com/android/launcher3/model/ShortcutsChangedTask.java +++ b/src/com/android/launcher3/model/ShortcutsChangedTask.java @@ -51,7 +51,8 @@ public class ShortcutsChangedTask extends ExtendedModelTask { @Override public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) { - DeepShortcutManager deepShortcutManager = app.getShortcutManager(); + final Context context = app.getContext(); + DeepShortcutManager deepShortcutManager = DeepShortcutManager.getInstance(context); deepShortcutManager.onShortcutsChanged(mShortcuts); // Find ShortcutInfo's that have changed on the workspace. @@ -67,7 +68,6 @@ public class ShortcutsChangedTask extends ExtendedModelTask { } } - final Context context = LauncherAppState.getInstance().getContext(); final ArrayList<ShortcutInfo> updatedShortcutInfos = new ArrayList<>(); if (!idsToWorkspaceShortcutInfos.isEmpty()) { // Update the workspace to reflect the changes to updated shortcuts residing on it. diff --git a/src/com/android/launcher3/model/UserLockStateChangedTask.java b/src/com/android/launcher3/model/UserLockStateChangedTask.java index b7b52a448..a89fe0bd7 100644 --- a/src/com/android/launcher3/model/UserLockStateChangedTask.java +++ b/src/com/android/launcher3/model/UserLockStateChangedTask.java @@ -50,7 +50,7 @@ public class UserLockStateChangedTask extends ExtendedModelTask { public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) { Context context = app.getContext(); boolean isUserUnlocked = UserManagerCompat.getInstance(context).isUserUnlocked(mUser); - DeepShortcutManager deepShortcutManager = app.getShortcutManager(); + DeepShortcutManager deepShortcutManager = DeepShortcutManager.getInstance(context); HashMap<ShortcutKey, ShortcutInfoCompat> pinnedShortcuts = new HashMap<>(); if (isUserUnlocked) { |