Merge "Remove workspace layout logging that used dumpsys" into ub-launcher3-master (103dfd88) · Commits · e / os / android_packages_apps_Trebuchet

protos/launcher_dump.proto

deleted100644 → 0

+0 −75

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		syntax = "proto2";

		option java_package = "com.android.launcher3.model";
		option java_outer_classname = "LauncherDumpProto";

		package model;

		message DumpTarget {
		enum Type {
		NONE = 0;
		ITEM = 1;
		CONTAINER = 2;
		}

		optional Type type = 1;
		optional int32 page_id = 2;
		optional int32 grid_x = 3;
		optional int32 grid_y = 4;

		// For container types only
		optional ContainerType container_type = 5;

		// For item types only
		optional ItemType item_type = 6;

		optional string package_name = 7; // All ItemTypes except UNKNOWN type
		optional string component = 8; // All ItemTypes except UNKNOWN type
		optional string item_id = 9; // For Pinned Shortcuts and appWidgetId

		optional int32 span_x = 10 [default = 1];// Used for ItemType.WIDGET
		optional int32 span_y = 11 [default = 1];// Used for ItemType.WIDGET
		optional UserType user_type = 12;
		}

		// Used to define what type of item a Target would represent.
		enum ItemType {
		UNKNOWN_ITEMTYPE = 0; // Launcher specific items
		APP_ICON = 1; // Regular app icons
		WIDGET = 2; // Elements from AppWidgetManager
		SHORTCUT = 3; // ShortcutManager
		}

		// Used to define what type of container a Target would represent.
		enum ContainerType {
		UNKNOWN_CONTAINERTYPE = 0;
		WORKSPACE = 1;
		HOTSEAT = 2;
		FOLDER = 3;
		}

		// Used to define what type of control a Target would represent.
		enum UserType {
		DEFAULT = 0;
		WORK = 1;
		}

		// Main message;
		message LauncherImpression {
		repeated DumpTarget targets = 1;
		}

src/com/android/launcher3/logging/DumpTargetWrapper.java

deleted100644 → 0

+0 −169

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.launcher3.logging;

		import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;

		import android.content.ComponentName;
		import android.os.Process;
		import android.text.TextUtils;

		import com.android.launcher3.ItemInfo;
		import com.android.launcher3.LauncherAppWidgetInfo;
		import com.android.launcher3.LauncherSettings;
		import com.android.launcher3.WorkspaceItemInfo;
		import com.android.launcher3.model.nano.LauncherDumpProto;
		import com.android.launcher3.model.nano.LauncherDumpProto.ContainerType;
		import com.android.launcher3.model.nano.LauncherDumpProto.DumpTarget;
		import com.android.launcher3.model.nano.LauncherDumpProto.ItemType;
		import com.android.launcher3.model.nano.LauncherDumpProto.UserType;
		import com.android.launcher3.util.ShortcutUtil;

		import java.util.ArrayList;
		import java.util.List;

		/**
		* This class can be used when proto definition doesn't support nesting.
		*/
		public class DumpTargetWrapper {
		DumpTarget node;
		ArrayList<DumpTargetWrapper> children;

		public DumpTargetWrapper() {
		children = new ArrayList<>();
		}

		public DumpTargetWrapper(int containerType, int id) {
		this();
		node = newContainerTarget(containerType, id);
		}

		public DumpTargetWrapper(ItemInfo info) {
		this();
		node = newItemTarget(info);
		}

		public DumpTarget getDumpTarget() {
		return node;
		}

		public void add(DumpTargetWrapper child) {
		children.add(child);
		}

		public List<DumpTarget> getFlattenedList() {
		ArrayList<DumpTarget> list = new ArrayList<>();
		list.add(node);
		if (!children.isEmpty()) {
		for(DumpTargetWrapper t: children) {
		list.addAll(t.getFlattenedList());
		}
		list.add(node); // add a delimiter empty object
		}
		return list;
		}
		public DumpTarget newItemTarget(ItemInfo info) {
		DumpTarget dt = new DumpTarget();
		dt.type = DumpTarget.Type.ITEM;
		if (info == null) {
		return dt;
		}
		switch (info.itemType) {
		case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION:
		dt.itemType = ItemType.APP_ICON;
		break;
		case LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET:
		dt.itemType = ItemType.WIDGET;
		break;
		case ITEM_TYPE_DEEP_SHORTCUT:
		case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:
		dt.itemType = ItemType.SHORTCUT;
		break;
		default:
		dt.itemType = ItemType.UNKNOWN_ITEMTYPE;
		break;
		}
		return dt;
		}

		public DumpTarget newContainerTarget(int type, int id) {
		DumpTarget dt = new DumpTarget();
		dt.type = DumpTarget.Type.CONTAINER;
		dt.containerType = type;
		dt.pageId = id;
		return dt;
		}

		public static String getDumpTargetStr(DumpTarget t) {
		if (t == null){
		return "";
		}
		switch (t.type) {
		case LauncherDumpProto.DumpTarget.Type.ITEM:
		return getItemStr(t);
		case LauncherDumpProto.DumpTarget.Type.CONTAINER:
		String str = LoggerUtils.getFieldName(t.containerType, ContainerType.class);
		if (t.containerType == ContainerType.WORKSPACE) {
		str += " id=" + t.pageId;
		} else if (t.containerType == ContainerType.FOLDER) {
		str += " grid(" + t.gridX + "," + t.gridY+ ")";
		}
		return str;
		default:
		return "UNKNOWN TARGET TYPE";
		}
		}

		private static String getItemStr(DumpTarget t) {
		if (t == null) {
		return "";
		}
		String typeStr = LoggerUtils.getFieldName(t.itemType, ItemType.class);
		if (!TextUtils.isEmpty(t.packageName)) {
		typeStr += ", package=" + t.packageName;
		}
		if (!TextUtils.isEmpty(t.component)) {
		typeStr += ", component=" + t.component;
		}
		return typeStr + ", grid(" + t.gridX + "," + t.gridY + "), span(" + t.spanX + "," + t.spanY
		+ "), pageIdx=" + t.pageId + " user=" + t.userType;
		}

		public DumpTarget writeToDumpTarget(ItemInfo info) {
		if (info == null) {
		return node;
		}
		if (ShortcutUtil.isDeepShortcut(info)) {
		node.component = ((WorkspaceItemInfo) info).getDeepShortcutId();
		} else {
		ComponentName cmp = info.getTargetComponent();
		node.component = cmp == null ? "" : cmp.flattenToString();
		}
		node.packageName = info.getTargetComponent() == null? "":
		info.getTargetComponent().getPackageName();
		if (info instanceof LauncherAppWidgetInfo) {
		node.component = ((LauncherAppWidgetInfo) info).providerName.flattenToString();
		node.packageName = ((LauncherAppWidgetInfo) info).providerName.getPackageName();
		}

		node.gridX = info.cellX;
		node.gridY = info.cellY;
		node.spanX = info.spanX;
		node.spanY = info.spanY;
		node.userType = (info.user.equals(Process.myUserHandle()))? UserType.DEFAULT : UserType.WORK;
		return node;
		}
		}

src/com/android/launcher3/model/BgDataModel.java

+0 −95

Original line number	Diff line number	Diff line
		@@ -36,10 +36,6 @@ import com.android.launcher3.PromiseAppInfo;
		import com.android.launcher3.Workspace;
		import com.android.launcher3.WorkspaceItemInfo;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.logging.DumpTargetWrapper;
		import com.android.launcher3.model.nano.LauncherDumpProto;
		import com.android.launcher3.model.nano.LauncherDumpProto.ContainerType;
		import com.android.launcher3.model.nano.LauncherDumpProto.DumpTarget;
		import com.android.launcher3.shortcuts.ShortcutKey;
		import com.android.launcher3.shortcuts.ShortcutRequest;
		import com.android.launcher3.util.ComponentKey;
		@@ -50,11 +46,7 @@ import com.android.launcher3.util.ItemInfoMatcher;
		import com.android.launcher3.util.ViewOnDrawExecutor;
		import com.android.launcher3.widget.WidgetListRowEntry;

		import com.google.protobuf.nano.MessageNano;

		import java.io.FileDescriptor;
		import java.io.FileOutputStream;
		import java.io.IOException;
		import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.Arrays;
		@@ -150,10 +142,6 @@ public class BgDataModel {

		public synchronized void dump(String prefix, FileDescriptor fd, PrintWriter writer,
		String[] args) {
		if (Arrays.asList(args).contains("--proto")) {
		dumpProto(prefix, fd, writer, args);
		return;
		}
		writer.println(prefix + "Data Model:");
		writer.println(prefix + " ---- workspace items ");
		for (int i = 0; i < workspaceItems.size(); i++) {
		@@ -181,89 +169,6 @@ public class BgDataModel {
		}
		}

		private synchronized void dumpProto(String prefix, FileDescriptor fd, PrintWriter writer,
		String[] args) {

		// Add top parent nodes. (L1)
		DumpTargetWrapper hotseat = new DumpTargetWrapper(ContainerType.HOTSEAT, 0);
		IntSparseArrayMap<DumpTargetWrapper> workspaces = new IntSparseArrayMap<>();
		IntArray workspaceScreens = collectWorkspaceScreens();
		for (int i = 0; i < workspaceScreens.size(); i++) {
		workspaces.put(workspaceScreens.get(i),
		new DumpTargetWrapper(ContainerType.WORKSPACE, i));
		}
		DumpTargetWrapper dtw;
		// Add non leaf / non top nodes (L2)
		for (int i = 0; i < folders.size(); i++) {
		FolderInfo fInfo = folders.valueAt(i);
		dtw = new DumpTargetWrapper(ContainerType.FOLDER, folders.size());
		dtw.writeToDumpTarget(fInfo);
		for(WorkspaceItemInfo sInfo: fInfo.contents) {
		DumpTargetWrapper child = new DumpTargetWrapper(sInfo);
		child.writeToDumpTarget(sInfo);
		dtw.add(child);
		}
		if (fInfo.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
		hotseat.add(dtw);
		} else if (fInfo.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) {
		workspaces.get(fInfo.screenId).add(dtw);
		}
		}
		// Add leaf nodes (L3): *Info
		for (int i = 0; i < workspaceItems.size(); i++) {
		ItemInfo info = workspaceItems.get(i);
		if (info instanceof FolderInfo) {
		continue;
		}
		dtw = new DumpTargetWrapper(info);
		dtw.writeToDumpTarget(info);
		if (info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
		hotseat.add(dtw);
		} else if (info.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) {
		workspaces.get(info.screenId).add(dtw);
		}
		}
		for (int i = 0; i < appWidgets.size(); i++) {
		ItemInfo info = appWidgets.get(i);
		dtw = new DumpTargetWrapper(info);
		dtw.writeToDumpTarget(info);
		if (info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
		hotseat.add(dtw);
		} else if (info.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) {
		workspaces.get(info.screenId).add(dtw);
		}
		}


		// Traverse target wrapper
		ArrayList<DumpTarget> targetList = new ArrayList<>();
		targetList.addAll(hotseat.getFlattenedList());
		for (int i = 0; i < workspaces.size(); i++) {
		targetList.addAll(workspaces.valueAt(i).getFlattenedList());
		}

		if (Arrays.asList(args).contains("--debug")) {
		for (int i = 0; i < targetList.size(); i++) {
		writer.println(prefix + DumpTargetWrapper.getDumpTargetStr(targetList.get(i)));
		}
		return;
		} else {
		LauncherDumpProto.LauncherImpression proto = new LauncherDumpProto.LauncherImpression();
		proto.targets = new DumpTarget[targetList.size()];
		for (int i = 0; i < targetList.size(); i++) {
		proto.targets[i] = targetList.get(i);
		}
		FileOutputStream fos = new FileOutputStream(fd);
		try {

		fos.write(MessageNano.toByteArray(proto));
		Log.d(TAG, MessageNano.toByteArray(proto).length + "Bytes");
		} catch (IOException e) {
		Log.e(TAG, "Exception writing dumpsys --proto", e);
		}
		}
		}

		public synchronized void removeItem(Context context, ItemInfo... items) {
		removeItem(context, Arrays.asList(items));
		}