diff options
| author | Rajeev Kumar <rajekumar@google.com> | 2017-06-15 22:31:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-15 22:31:19 +0000 |
| commit | da3c18dcbd7f7a1e81872a4b983b7174ff5ca254 (patch) | |
| tree | 18aad90c5fe9d35f3bb5f43076e1b1de5c88c605 /src | |
| parent | 0130a0555be2790c97ef6480da7eec7f826a808d (diff) | |
| parent | 443bfc8600c4d979c62400eafb3f623d9d3a4ed1 (diff) | |
| download | android_packages_apps_Trebuchet-da3c18dcbd7f7a1e81872a4b983b7174ff5ca254.tar.gz android_packages_apps_Trebuchet-da3c18dcbd7f7a1e81872a4b983b7174ff5ca254.tar.bz2 android_packages_apps_Trebuchet-da3c18dcbd7f7a1e81872a4b983b7174ff5ca254.zip | |
Merge "1. Get rid of few unnecessary boxing in BgDataModel class. 2. Get rid of an unnecessary return statment from BgDataModel class." into ub-launcher3-dorval-polish
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/model/BgDataModel.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java index d9c5143f2..816c1d46d 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<String> 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<DumpTargetWrapper> 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); } } |