diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-11-21 02:19:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-21 02:19:26 +0000 |
| commit | e64b0dfcd0d4113e9259b6270cff734089f4cd3f (patch) | |
| tree | 00c7d7761e96229a147d4f59078d6a9cae2ce13c | |
| parent | 6a403370b4cf377e80fa586dde3648a593693b44 (diff) | |
| parent | 3da888d17c020b39ba36dbc99b681bf3339d269f (diff) | |
| download | android_packages_apps_Trebuchet-e64b0dfcd0d4113e9259b6270cff734089f4cd3f.tar.gz android_packages_apps_Trebuchet-e64b0dfcd0d4113e9259b6270cff734089f4cd3f.tar.bz2 android_packages_apps_Trebuchet-e64b0dfcd0d4113e9259b6270cff734089f4cd3f.zip | |
am 3da888d1: Merge "Disabling auto addition of managed profile shortcuts" into ub-now-queens
* commit '3da888d17c020b39ba36dbc99b681bf3339d269f':
Disabling auto addition of managed profile shortcuts
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 11440c0fc..954887dc3 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -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 |