diff options
author | Kenny Guy <kennyguy@google.com> | 2014-04-30 03:02:21 +0100 |
---|---|---|
committer | Kenny Guy <kennyguy@google.com> | 2014-04-30 23:43:00 +0100 |
commit | ed13187a745866483139e2878037e1f8427ce567 (patch) | |
tree | a60e4ab78d5365095fe90026df4dfa4e98e80d46 /src/com/android/launcher3/ItemInfo.java | |
parent | 70c3d1da65fcdaf32b860a5582b211c1f0ae8718 (diff) | |
download | android_packages_apps_Trebuchet-ed13187a745866483139e2878037e1f8427ce567.tar.gz android_packages_apps_Trebuchet-ed13187a745866483139e2878037e1f8427ce567.tar.bz2 android_packages_apps_Trebuchet-ed13187a745866483139e2878037e1f8427ce567.zip |
Launcher3 multi-profile support
Use LauncherApps API and badging APIs instead of PackageManager.
With compatability layer that uses PackageManager pre L.
Adds support to show apps from current user and any managed profiles.
Background: Managed profiles are user sandboxes that are visible from
the primary user and can be launched as if they are a part of this user.
A launcher should now be capable of listing apps from this user as well
as related profiles of this user.
Launching of activities is now via the LauncherApps interface, to allow
for cross-profile app launching. Only activities with category LAUNCHER
can be added as a shortcut on the workspace for a managed profile.
Widgets and non-application shortcuts are only supported for the
current profile. Widgets from the managed profile are not available.
Change-Id: I5f396b1bf7f91ad91a5710ea4a0fd14573972eb9
Diffstat (limited to 'src/com/android/launcher3/ItemInfo.java')
-rw-r--r-- | src/com/android/launcher3/ItemInfo.java | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/com/android/launcher3/ItemInfo.java b/src/com/android/launcher3/ItemInfo.java index 12bbee780..74f16e325 100644 --- a/src/com/android/launcher3/ItemInfo.java +++ b/src/com/android/launcher3/ItemInfo.java @@ -17,10 +17,14 @@ package com.android.launcher3; import android.content.ContentValues; +import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.util.Log; +import com.android.launcher3.compat.UserHandleCompat; +import com.android.launcher3.compat.UserManagerCompat; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Arrays; @@ -29,6 +33,11 @@ import java.util.Arrays; * Represents an item in the launcher. */ public class ItemInfo { + + /** + * Intent extra to store the profile. Format: UserHandle + */ + static final String EXTRA_PROFILE = "profile"; static final int NO_ID = -1; @@ -103,6 +112,8 @@ public class ItemInfo { */ int[] dropPos = null; + UserHandleCompat user; + ItemInfo() { } @@ -115,6 +126,7 @@ public class ItemInfo { screenId = info.screenId; itemType = info.itemType; container = info.container; + user = info.user; // tempdebug: LauncherModel.checkItemInfo(this); } @@ -130,9 +142,11 @@ public class ItemInfo { /** * Write the fields of this item to the DB * + * @param context A context object to use for getting UserManagerCompat * @param values */ - void onAddToDatabase(ContentValues values) { + + void onAddToDatabase(Context context, ContentValues values) { values.put(LauncherSettings.BaseLauncherColumns.ITEM_TYPE, itemType); values.put(LauncherSettings.Favorites.CONTAINER, container); values.put(LauncherSettings.Favorites.SCREEN, screenId); @@ -140,6 +154,8 @@ public class ItemInfo { values.put(LauncherSettings.Favorites.CELLY, cellY); values.put(LauncherSettings.Favorites.SPANX, spanX); values.put(LauncherSettings.Favorites.SPANY, spanY); + long serialNumber = UserManagerCompat.getInstance(context).getSerialNumberForUser(user); + values.put(LauncherSettings.Favorites.PROFILE_ID, serialNumber); if (screenId == Workspace.EXTRA_EMPTY_SCREEN_ID) { // We should never persist an item on the extra empty screen. @@ -188,6 +204,7 @@ public class ItemInfo { public String toString() { return "Item(id=" + this.id + " type=" + this.itemType + " container=" + this.container + " screen=" + screenId + " cellX=" + cellX + " cellY=" + cellY + " spanX=" + spanX - + " spanY=" + spanY + " dropPos=" + Arrays.toString(dropPos) + ")"; + + " spanY=" + spanY + " dropPos=" + Arrays.toString(dropPos) + + " user=" + user + ")"; } } |