aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Disabling auto addition of managed profile shortcuts" into ub-now-queens

Browse Source
This commit is contained in:
Sunny Goyal
2014-11-21 02:10:07 +00:00
committed by Android (Google) Code Review
parent c254da26a6 2a66bbf3f0
commit 3da888d17c
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/launcher3/LauncherModel.java
View File

@@ -87,6 +87,7 @@ public class LauncherModel extends BroadcastReceiver
static final boolean DEBUG_LOADERS = false;
private static final boolean DEBUG_RECEIVER = false;
private static final boolean REMOVE_UNRESTORED_ICONS = true;
private static final boolean ADD_MANAGED_PROFILE_SHORTCUTS = false;
static final String TAG = "Launcher.Model";
@@ -2847,7 +2848,7 @@ public class LauncherModel extends BroadcastReceiver
mBgAllAppsList.add(new AppInfo(mContext, app, user, mIconCache, mLabelCache));
}
if (!user.equals(UserHandleCompat.myUserHandle())) {
if (ADD_MANAGED_PROFILE_SHORTCUTS && !user.equals(UserHandleCompat.myUserHandle())) {
// Add shortcuts for packages which were installed while launcher was dead.
String shortcutsSetKey = INSTALLED_SHORTCUTS_SET_PREFIX
+ mUserManager.getSerialNumberForUser(user);
@@ -2981,7 +2982,8 @@ public class LauncherModel extends BroadcastReceiver
}
// Auto add shortcuts for added packages.
if (!UserHandleCompat.myUserHandle().equals(mUser)) {
if (ADD_MANAGED_PROFILE_SHORTCUTS
&& !UserHandleCompat.myUserHandle().equals(mUser)) {
SharedPreferences prefs = context.getSharedPreferences(
LauncherAppState.getSharedPreferencesKey(), Context.MODE_PRIVATE);
String shortcutsSetKey = INSTALLED_SHORTCUTS_SET_PREFIX
@@ -3015,7 +3017,8 @@ public class LauncherModel extends BroadcastReceiver
case OP_REMOVE:
// Remove the packageName for the set of auto-installed shortcuts. This
// will ensure that the shortcut when the app is installed again.
if (!UserHandleCompat.myUserHandle().equals(mUser)) {
if (ADD_MANAGED_PROFILE_SHORTCUTS
&& !UserHandleCompat.myUserHandle().equals(mUser)) {
SharedPreferences prefs = context.getSharedPreferences(
LauncherAppState.getSharedPreferencesKey(), Context.MODE_PRIVATE);
String shortcutsSetKey = INSTALLED_SHORTCUTS_SET_PREFIX