Clean up around 1) Log.VERBOSE and 2) dump

b/31772480

Note: in the follow up CL, I will add the dump result of the bgDataModel
to a proto

Change-Id: I5261cff0fb29cedd1dd772b8b15f67095ad5b967
This commit is contained in:
Hyunyoung Song
2017-01-30 15:11:27 -08:00
parent 1fafd719cb
commit 3c7d9cbb20
8 changed files with 109 additions and 92 deletions

View File

@@ -17,6 +17,7 @@ package com.android.launcher3.model;
import android.content.Context;
import android.os.UserHandle;
import android.text.TextUtils;
import android.util.Log;
import android.util.MutableInt;
@@ -35,6 +36,8 @@ import com.android.launcher3.util.ComponentKey;
import com.android.launcher3.util.LongArrayMap;
import com.android.launcher3.util.MultiHashMap;
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -99,6 +102,37 @@ public class BgDataModel {
deepShortcutMap.clear();
}
// TODO: current dump is very cryptic and hard to understand. Make it more legible.
public synchronized void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {
writer.println(prefix + "Data Model:");
for (int i = 0; i < workspaceScreens.size(); i++) {
writer.println(prefix + "\tIndex of workspaceScreens:" + workspaceScreens.get(i).toString());
}
for (int i = 0; i < workspaceItems.size(); i++) {
writer.println(prefix + '\t' + workspaceItems.get(i).toString());
}
for (int i = 0; i < appWidgets.size(); i++) {
writer.println(prefix + '\t' + appWidgets.get(i).toString());
}
for (int i = 0; i< folders.size(); i++) {
writer.println(prefix + '\t' + folders.valueAt(i).toString());
}
for (int i = 0; i< itemsIdMap.size(); i++) {
writer.println(prefix + '\t' + itemsIdMap.valueAt(i).toString());
}
if (args.length > 0 && TextUtils.equals(args[0], "--all")) {
writer.println(prefix + "shortcuts");
for (ArrayList<String> map : deepShortcutMap.values()) {
writer.print(prefix + " ");
for (String str : map) {
writer.print(str.toString() + ", ");
}
writer.println();
}
}
}
public synchronized void removeItem(Context context, ItemInfo... items) {
removeItem(context, Arrays.asList(items));
}