diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-03-21 23:21:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-21 23:21:26 +0000 |
| commit | d23f37794f2a326623313d7df1e53d2863cd030b (patch) | |
| tree | dda441b39a21b6d196c9ad364796efc6678de68e /src/com/android/launcher3/LauncherModel.java | |
| parent | e28fb8354e1e69ffff5bf051f60797c15b0834e0 (diff) | |
| parent | 77ff9a4343aa40f0d893a9b65ecfbe4bf89e65e7 (diff) | |
| download | android_packages_apps_Trebuchet-d23f37794f2a326623313d7df1e53d2863cd030b.tar.gz android_packages_apps_Trebuchet-d23f37794f2a326623313d7df1e53d2863cd030b.tar.bz2 android_packages_apps_Trebuchet-d23f37794f2a326623313d7df1e53d2863cd030b.zip | |
Merge "Removing the profile extra from intent and using the profile id from the profile column" into ub-launcher3-dorval
am: 77ff9a4343
Change-Id: Ib0cd8cb8f963b78a9cd53ed896aeb6e4f6163683
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 39b9dd3d2..58fb117a4 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1062,9 +1062,6 @@ public class LauncherModel extends BroadcastReceiver info.rank = c.getInt(rankIndex); info.spanX = 1; info.spanY = 1; - // TODO: Remove this extra. Instead we should be using - // itemInfo#user. - info.intent.putExtra(ItemInfo.EXTRA_PROFILE, c.serialNumber); info.isDisabled |= disabledState; if (isSafeMode && !Utilities.isSystemApp(context, intent)) { info.isDisabled |= ShortcutInfo.FLAG_DISABLED_SAFEMODE; @@ -1684,7 +1681,7 @@ public class LauncherModel extends BroadcastReceiver for (int i = 0; i < apps.size(); i++) { LauncherActivityInfo app = apps.get(i); // This builds the icon bitmaps. - mBgAllAppsList.add(new AppInfo(mContext, app, user, quietMode), app); + mBgAllAppsList.add(new AppInfo(app, user, quietMode), app); } final ManagedProfileHeuristic heuristic = ManagedProfileHeuristic.get(mContext, user); |