aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 16:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changing DeepShortcutManager to have a singleton contructor instead

Browse Source 
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
This commit is contained in:
Sunny Goyal
2016-11-21 16:02:39 +05:30
parent aa8a871e33
commit dde4fd971e
9 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/launcher3/model/BgDataModel.java
View File

@@ -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