Merge changes I0efc513b,Ibe45ba62 into nyc-dev (e7be30d7) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,9 @@ import com.android.systemui.recents.views.RecentsView;
		import com.android.systemui.recents.views.SystemBarScrimViews;
		import com.android.systemui.statusbar.BaseStatusBar;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;

		/**
		* The main Recents activity that is started from AlternateRecentsComponent.
		*/
		@@ -733,4 +736,20 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD
		});
		return true;
		}

		@Override
		public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {
		super.dump(prefix, fd, writer, args);
		String id = Integer.toHexString(System.identityHashCode(this));

		writer.print(prefix); writer.print(TAG);
		writer.print(" visible="); writer.print(mIsVisible ? "Y" : "N");
		writer.print(" [0x"); writer.print(id); writer.print("]");
		writer.println();

		if (mRecentsView != null) {
		mRecentsView.dump(prefix, writer);
		}
		EventBus.getDefault().dump(prefix, writer);
		}
		}

packages/SystemUI/src/com/android/systemui/recents/events/EventBus.java

+31 −6

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import android.util.MutableBoolean;

		import com.android.systemui.recents.misc.ReferenceCountedTrigger;

		import java.io.PrintWriter;
		import java.lang.ref.WeakReference;
		import java.lang.reflect.Constructor;
		import java.lang.reflect.InvocationTargetException;
		@@ -652,19 +653,43 @@ public class EventBus extends BroadcastReceiver {
		/**
		* @return a dump of the current state of the EventBus
		*/
		public String dump() {
		public void dump(String prefix, PrintWriter writer) {
		writer.println(dumpInternal(prefix));
		}

		public String dumpInternal(String prefix) {
		String innerPrefix = prefix + " ";
		String innerInnerPrefix = innerPrefix + " ";
		StringBuilder output = new StringBuilder();
		output.append(prefix);
		output.append("Registered class types:");
		output.append("\n");
		for (Class<?> clz : mSubscriberTypeMap.keySet()) {
		output.append("\t");
		ArrayList<Class<?>> subsciberTypes = new ArrayList<>(mSubscriberTypeMap.keySet());
		Collections.sort(subsciberTypes, new Comparator<Class<?>>() {
		@Override
		public int compare(Class<?> o1, Class<?> o2) {
		return o1.getSimpleName().compareTo(o2.getSimpleName());
		}
		});
		for (int i = 0; i < subsciberTypes.size(); i++) {
		Class<?> clz = subsciberTypes.get(i);
		output.append(innerPrefix);
		output.append(clz.getSimpleName());
		output.append("\n");
		}
		output.append(prefix);
		output.append("Event map:");
		output.append("\n");
		for (Class<?> clz : mEventTypeMap.keySet()) {
		output.append("\t");
		ArrayList<Class<?>> classes = new ArrayList<>(mEventTypeMap.keySet());
		Collections.sort(classes, new Comparator<Class<?>>() {
		@Override
		public int compare(Class<?> o1, Class<?> o2) {
		return o1.getSimpleName().compareTo(o2.getSimpleName());
		}
		});
		for (int i = 0; i < classes.size(); i++) {
		Class<?> clz = classes.get(i);
		output.append(innerPrefix);
		output.append(clz.getSimpleName());
		output.append(" -> ");
		output.append("\n");
		@@ -673,7 +698,7 @@ public class EventBus extends BroadcastReceiver {
		Object subscriber = handler.subscriber.getReference();
		if (subscriber != null) {
		String id = Integer.toHexString(System.identityHashCode(subscriber));
		output.append("\t\t");
		output.append(innerInnerPrefix);
		output.append(subscriber.getClass().getSimpleName());
		output.append(" [0x" + id + ", #" + handler.priority + "]");
		output.append("\n");

packages/SystemUI/src/com/android/systemui/recents/misc/Utilities.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -243,4 +243,14 @@ public class Utilities {
		public static float dpToPx(Resources res, float dp) {
		return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, res.getDisplayMetrics());
		}

		/**
		* Returns a lightweight dump of a rect.
		*/
		public static String dumpRect(Rect r) {
		if (r == null) {
		return "N:0,0-0,0";
		}
		return r.left + "," + r.top + "-" + r.right + "," + r.bottom;
		}
		}

packages/SystemUI/src/com/android/systemui/recents/model/Task.java

+15 −1

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import com.android.systemui.recents.Recents;
		import com.android.systemui.recents.misc.SystemServicesProxy;
		import com.android.systemui.recents.misc.Utilities;

		import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.Objects;

		@@ -37,6 +38,9 @@ import java.util.Objects;
		* A task represents the top most task in the system's task stack.
		*/
		public class Task {

		public static final String TAG = "Task";

		/* Task callbacks */
		public interface TaskCallbacks {
		/* Notifies when a task has been bound */
		@@ -100,7 +104,8 @@ public class Task {

		@Override
		public String toString() {
		return "t" + id + ", s" + stackId + ", u" + userId;
		return "id=" + id + " stackId=" + stackId + " user=" + userId + " lastActiveTime=" +
		lastActiveTime;
		}

		private void updateHashCode() {
		@@ -306,4 +311,13 @@ public class Task {
		public String toString() {
		return "[" + key.toString() + "] " + title;
		}

		public void dump(String prefix, PrintWriter writer) {
		writer.print(prefix); writer.print(key);
		if (affiliationTaskId != key.id) {
		writer.print(" "); writer.print("affTaskId=" + affiliationTaskId);
		}
		writer.print(" "); writer.print(title);
		writer.println();
		}
		}

packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java

+27 −4

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ import com.android.systemui.recents.views.AnimationProps;
		import com.android.systemui.recents.views.DropTarget;
		import com.android.systemui.recents.views.TaskStackLayoutAlgorithm;

		import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.Collections;
		import java.util.Comparator;
		@@ -208,6 +209,8 @@ class FilteredTaskList {
		*/
		public class TaskStack {

		private static final String TAG = "TaskStack";

		/** Task stack callbacks */
		public interface TaskStackCallbacks {
		/**
		@@ -725,7 +728,9 @@ public class TaskStack {
		/** Finds the task with the specified task id. */
		public Task findTaskWithId(int taskId) {
		ArrayList<Task> tasks = computeAllTasksList();
		for (Task task : tasks) {
		int taskCount = tasks.size();
		for (int i = 0; i < taskCount; i++) {
		Task task = tasks.get(i);
		if (task.key.id == taskId) {
		return task;
		}
		@@ -880,7 +885,10 @@ public class TaskStack {
		ArraySet<ComponentName> existingComponents = new ArraySet<>();
		ArraySet<ComponentName> removedComponents = new ArraySet<>();
		ArrayList<Task.TaskKey> taskKeys = getTaskKeys();
		for (Task.TaskKey t : taskKeys) {
		int taskKeyCount = taskKeys.size();
		for (int i = 0; i < taskKeyCount; i++) {
		Task.TaskKey t = taskKeys.get(i);

		// Skip if this doesn't apply to the current user
		if (t.userId != userId) continue;

		@@ -903,8 +911,10 @@ public class TaskStack {
		@Override
		public String toString() {
		String str = "Stack Tasks (" + mStackTaskList.size() + "):\n";
		for (Task t : mStackTaskList.getTasks()) {
		str += " " + t.toString() + "\n";
		ArrayList<Task> tasks = mStackTaskList.getTasks();
		int taskCount = tasks.size();
		for (int i = 0; i < taskCount; i++) {
		str += " " + tasks.get(i).toString() + "\n";
		}
		return str;
		}
		@@ -921,4 +931,17 @@ public class TaskStack {
		}
		return map;
		}

		public void dump(String prefix, PrintWriter writer) {
		String innerPrefix = prefix + " ";

		writer.print(prefix); writer.print(TAG);
		writer.print(" numStackTasks="); writer.print(mStackTaskList.size());
		writer.println();
		ArrayList<Task> tasks = mStackTaskList.getTasks();
		int taskCount = tasks.size();
		for (int i = 0; i < taskCount; i++) {
		tasks.get(i).dump(innerPrefix, writer);
		}
		}
		}