From be3e410b7a62fa64ffda825b824862eb9d0c98c5 Mon Sep 17 00:00:00 2001 From: Sameer Padala Date: Mon, 21 Apr 2014 19:36:14 -0700 Subject: Fix source code so it compiles on google3 This is a follow up to cr/65191596 which checked for String + array warnings. Change-Id: Id70eaa32b63b838b03be21d632c7470039b6423f --- src/com/android/launcher3/AppInfo.java | 4 +++- src/com/android/launcher3/FolderInfo.java | 3 ++- src/com/android/launcher3/ItemInfo.java | 3 ++- src/com/android/launcher3/ShortcutInfo.java | 3 ++- 4 files changed, 9 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/com/android/launcher3/AppInfo.java b/src/com/android/launcher3/AppInfo.java index f85f69120..c16e98f0c 100644 --- a/src/com/android/launcher3/AppInfo.java +++ b/src/com/android/launcher3/AppInfo.java @@ -26,6 +26,7 @@ import android.graphics.Bitmap; import android.util.Log; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; /** @@ -137,7 +138,8 @@ public class AppInfo extends ItemInfo { return "ApplicationInfo(title=" + title.toString() + " id=" + this.id + " type=" + this.itemType + " container=" + this.container + " screen=" + screenId + " cellX=" + cellX + " cellY=" + cellY - + " spanX=" + spanX + " spanY=" + spanY + " dropPos=" + dropPos + ")"; + + " spanX=" + spanX + " spanY=" + spanY + " dropPos=" + Arrays.toString(dropPos) + + ")"; } public static void dumpApplicationInfoList(String tag, String label, ArrayList list) { diff --git a/src/com/android/launcher3/FolderInfo.java b/src/com/android/launcher3/FolderInfo.java index 42e2ec324..61fa7e574 100644 --- a/src/com/android/launcher3/FolderInfo.java +++ b/src/com/android/launcher3/FolderInfo.java @@ -19,6 +19,7 @@ package com.android.launcher3; import android.content.ContentValues; import java.util.ArrayList; +import java.util.Arrays; /** * Represents a folder containing shortcuts or apps. @@ -114,6 +115,6 @@ public class FolderInfo extends ItemInfo { return "FolderInfo(id=" + this.id + " type=" + this.itemType + " container=" + this.container + " screen=" + screenId + " cellX=" + cellX + " cellY=" + cellY + " spanX=" + spanX - + " spanY=" + spanY + " dropPos=" + dropPos + ")"; + + " spanY=" + spanY + " dropPos=" + Arrays.toString(dropPos) + ")"; } } diff --git a/src/com/android/launcher3/ItemInfo.java b/src/com/android/launcher3/ItemInfo.java index 3fe4c6079..9ac9edfbc 100644 --- a/src/com/android/launcher3/ItemInfo.java +++ b/src/com/android/launcher3/ItemInfo.java @@ -23,6 +23,7 @@ import android.util.Log; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.Arrays; /** * Represents an item in the launcher. @@ -182,6 +183,6 @@ 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=" + dropPos + ")"; + + " spanY=" + spanY + " dropPos=" + Arrays.toString(dropPos) + ")"; } } diff --git a/src/com/android/launcher3/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java index 5afa78480..92b582dba 100644 --- a/src/com/android/launcher3/ShortcutInfo.java +++ b/src/com/android/launcher3/ShortcutInfo.java @@ -27,6 +27,7 @@ import android.graphics.Bitmap; import android.util.Log; import java.util.ArrayList; +import java.util.Arrays; /** * Represents a launchable icon on the workspaces and in folders. @@ -226,7 +227,7 @@ public class ShortcutInfo extends ItemInfo { return "ShortcutInfo(title=" + title.toString() + "intent=" + intent + "id=" + this.id + " type=" + this.itemType + " container=" + this.container + " screen=" + screenId + " cellX=" + cellX + " cellY=" + cellY + " spanX=" + spanX + " spanY=" + spanY - + " dropPos=" + dropPos + ")"; + + " dropPos=" + Arrays.toString(dropPos) + ")"; } public static void dumpShortcutInfoList(String tag, String label, -- cgit v1.2.3