PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rajeev Kumar
2017-06-15 22:31:17 +00:00
committed by Android (Google) Code Review
parent 0130a0555b 443bfc8600
commit da3c18dcbd
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/model/BgDataModel.java
+5 -5
View File
@@ -152,7 +152,7 @@ public class BgDataModel {
for (ArrayList<String> map : deepShortcutMap.values()) { for (ArrayList<String> map : deepShortcutMap.values()) {
writer.print(prefix + " "); writer.print(prefix + " ");
for (String str : map) { for (String str : map) {
writer.print(str.toString() + ", "); writer.print(str + ", ");
} }
writer.println(); writer.println();
} }
@@ -166,7 +166,7 @@ public class BgDataModel {
DumpTargetWrapper hotseat = new DumpTargetWrapper(ContainerType.HOTSEAT, 0); DumpTargetWrapper hotseat = new DumpTargetWrapper(ContainerType.HOTSEAT, 0);
LongArrayMap<DumpTargetWrapper> workspaces = new LongArrayMap<>(); LongArrayMap<DumpTargetWrapper> workspaces = new LongArrayMap<>();
for (int i = 0; i < workspaceScreens.size(); i++) { 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)); new DumpTargetWrapper(ContainerType.WORKSPACE, i));
} }
DumpTargetWrapper dtw; DumpTargetWrapper dtw;
@@ -183,7 +183,7 @@ public class BgDataModel {
if (fInfo.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) { if (fInfo.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
hotseat.add(dtw); hotseat.add(dtw);
} else if (fInfo.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) { } 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 // Add leaf nodes (L3): *Info
@@ -197,7 +197,7 @@ public class BgDataModel {
if (info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) { if (info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
hotseat.add(dtw); hotseat.add(dtw);
} else if (info.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) { } 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++) { for (int i = 0; i < appWidgets.size(); i++) {
@@ -207,7 +207,7 @@ public class BgDataModel {
if (info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) { if (info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
hotseat.add(dtw); hotseat.add(dtw);
} else if (info.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) { } else if (info.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) {
workspaces.get(new Long(info.screenId)).add(dtw); workspaces.get(info.screenId).add(dtw);
} }
} }