No more UserHandleCompat

Bug: 32745285
Change-Id: I762fb4e268c1afe48a1860ab12a4ccb3f626aa95
This commit is contained in:
Sunny Goyal
2016-12-15 22:06:10 -08:00
parent 338dee9dd7
commit 7c74e4ae64
62 changed files with 376 additions and 505 deletions
+5 -5
View File
@@ -20,10 +20,10 @@ import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.os.UserHandle;
import android.util.Log;
import com.android.launcher3.compat.LauncherActivityInfoCompat;
import com.android.launcher3.compat.UserHandleCompat;
import com.android.launcher3.compat.UserManagerCompat;
import com.android.launcher3.util.ComponentKey;
import com.android.launcher3.util.PackageManagerHelper;
@@ -73,18 +73,18 @@ public class AppInfo extends ItemInfo {
/**
* Must not hold the Context.
*/
public AppInfo(Context context, LauncherActivityInfoCompat info, UserHandleCompat user,
public AppInfo(Context context, LauncherActivityInfoCompat info, UserHandle user,
IconCache iconCache) {
this(context, info, user, iconCache,
UserManagerCompat.getInstance(context).isQuietModeEnabled(user));
}
public AppInfo(Context context, LauncherActivityInfoCompat info, UserHandleCompat user,
public AppInfo(Context context, LauncherActivityInfoCompat info, UserHandle user,
IconCache iconCache, boolean quietModeEnabled) {
this(context, info, user, iconCache, quietModeEnabled, true /* useLowResIcon */);
}
public AppInfo(Context context, LauncherActivityInfoCompat info, UserHandleCompat user,
public AppInfo(Context context, LauncherActivityInfoCompat info, UserHandle user,
IconCache iconCache, boolean quietModeEnabled, boolean useLowResIcon) {
this.componentName = info.getComponentName();
this.container = ItemInfo.NO_ID;
@@ -134,7 +134,7 @@ public class AppInfo extends ItemInfo {
}
public static Intent makeLaunchIntent(Context context, LauncherActivityInfoCompat info,
UserHandleCompat user) {
UserHandle user) {
long serialNumber = UserManagerCompat.getInstance(context).getSerialNumberForUser(user);
return new Intent(Intent.ACTION_MAIN)
.addCategory(Intent.CATEGORY_LAUNCHER)