From 443bfc8600c4d979c62400eafb3f623d9d3a4ed1 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Thu, 15 Jun 2017 13:18:51 -0700 Subject: [PATCH] 1. Get rid of few unnecessary boxing in BgDataModel class. 2. Get rid of an unnecessary return statment from BgDataModel class. Change-Id: I7be47a75d3754bc621cff4af59d5b03cc3e53f10 --- src/com/android/launcher3/model/BgDataModel.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java index d9c5143f2e..816c1d46d6 100644 --- a/src/com/android/launcher3/model/BgDataModel.java +++ b/src/com/android/launcher3/model/BgDataModel.java @@ -152,7 +152,7 @@ public class BgDataModel { for (ArrayList map : deepShortcutMap.values()) { writer.print(prefix + " "); for (String str : map) { - writer.print(str.toString() + ", "); + writer.print(str + ", "); } writer.println(); } @@ -166,7 +166,7 @@ public class BgDataModel { DumpTargetWrapper hotseat = new DumpTargetWrapper(ContainerType.HOTSEAT, 0); LongArrayMap workspaces = new LongArrayMap<>(); for (int i = 0; i < workspaceScreens.size(); i++) { - workspaces.put(new Long(workspaceScreens.get(i)), + workspaces.put(workspaceScreens.get(i), new DumpTargetWrapper(ContainerType.WORKSPACE, i)); } DumpTargetWrapper dtw; @@ -183,7 +183,7 @@ public class BgDataModel { if (fInfo.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) { hotseat.add(dtw); } else if (fInfo.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) { - workspaces.get(new Long(fInfo.screenId)).add(dtw); + workspaces.get(fInfo.screenId).add(dtw); } } // Add leaf nodes (L3): *Info @@ -197,7 +197,7 @@ public class BgDataModel { if (info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) { hotseat.add(dtw); } else if (info.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) { - workspaces.get(new Long(info.screenId)).add(dtw); + workspaces.get(info.screenId).add(dtw); } } for (int i = 0; i < appWidgets.size(); i++) { @@ -207,7 +207,7 @@ public class BgDataModel { if (info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) { hotseat.add(dtw); } else if (info.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) { - workspaces.get(new Long(info.screenId)).add(dtw); + workspaces.get(info.screenId).add(dtw); } }