Merge "Fix predictiveApps Bug: 67010327" into ub-launcher3-dorval-polish2 (230cf17f) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/logging/LoggerUtils.java

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -105,13 +105,13 @@ public class LoggerUtils {
	private static String getItemStr(Target t) {		private static String getItemStr(Target t) {
	String typeStr = getFieldName(t.itemType, ItemType.class);		String typeStr = getFieldName(t.itemType, ItemType.class);
	if (t.packageNameHash != 0) {		if (t.packageNameHash != 0) {
	typeStr += ", packageHash=" + t.packageNameHash;		typeStr += ", packageHash=" + t.packageNameHash + ", predictiveRank=" + t.predictedRank;
	}		}
	if (t.componentHash != 0) {		if (t.componentHash != 0) {
	typeStr += ", componentHash=" + t.componentHash;		typeStr += ", componentHash=" + t.componentHash + ", predictiveRank=" + t.predictedRank;
	}		}
	if (t.intentHash != 0) {		if (t.intentHash != 0) {
	typeStr += ", intentHash=" + t.intentHash;		typeStr += ", intentHash=" + t.intentHash + ", predictiveRank=" + t.predictedRank;
	}		}
	return typeStr + ", grid(" + t.gridX + "," + t.gridY + "), span(" + t.spanX + "," + t.spanY		return typeStr + ", grid(" + t.gridX + "," + t.gridY + "), span(" + t.spanX + "," + t.spanY
	+ "), pageIdx=" + t.pageIndex;		+ "), pageIdx=" + t.pageIndex;
	@@ -125,9 +125,11 @@ public class LoggerUtils {

	public static Target newItemTarget(ItemInfo info) {		public static Target newItemTarget(ItemInfo info) {
	Target t = newTarget(Target.Type.ITEM);		Target t = newTarget(Target.Type.ITEM);

	switch (info.itemType) {		switch (info.itemType) {
	case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:		case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
	t.itemType = ItemType.APP_ICON;		t.itemType = ItemType.APP_ICON;
			t.predictedRank = -100; // Never assigned
	break;		break;
	case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:		case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:
	t.itemType = ItemType.SHORTCUT;		t.itemType = ItemType.SHORTCUT;