Merge "Config to debug overflow" (b3de2240) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java

+2 −19

Original line number	Diff line number	Diff line
		@@ -878,12 +878,12 @@ public class BubbleController implements ConfigurationController.ConfigurationLi

		if (DEBUG_BUBBLE_CONTROLLER) {
		Log.d(TAG, "[BubbleData]");
		Log.d(TAG, formatBubblesString(mBubbleData.getBubbles(),
		Log.d(TAG, BubbleDebugConfig.formatBubblesString(mBubbleData.getBubbles(),
		mBubbleData.getSelectedBubble()));

		if (mStackView != null) {
		Log.d(TAG, "[BubbleStackView]");
		Log.d(TAG, formatBubblesString(mStackView.getBubblesOnScreen(),
		Log.d(TAG, BubbleDebugConfig.formatBubblesString(mStackView.getBubblesOnScreen(),
		mStackView.getExpandedBubble()));
		}
		}
		@@ -972,23 +972,6 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
		pw.println();
		}

		static String formatBubblesString(List<Bubble> bubbles, Bubble selected) {
		StringBuilder sb = new StringBuilder();
		for (Bubble bubble : bubbles) {
		if (bubble == null) {
		sb.append(" <null> !!!!!\n");
		} else {
		boolean isSelected = (bubble == selected);
		sb.append(String.format("%s Bubble{act=%12d, ongoing=%d, key=%s}\n",
		((isSelected) ? "->" : " "),
		bubble.getLastActivity(),
		(bubble.isOngoing() ? 1 : 0),
		bubble.getKey()));
		}
		}
		return sb.toString();
		}

		/**
		* This task stack listener is responsible for responding to tasks moved to the front
		* which are on the default (main) display. When this happens, expanded bubbles must be

+20 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.systemui.bubbles;

		import java.util.List;

		/**
		* Common class for the various debug {@link android.util.Log} output configuration in the Bubbles
		* package.
		@@ -38,5 +40,23 @@ public class BubbleDebugConfig {
		static final boolean DEBUG_BUBBLE_STACK_VIEW = false;
		static final boolean DEBUG_BUBBLE_EXPANDED_VIEW = false;
		static final boolean DEBUG_EXPERIMENTS = true;
		static final boolean DEBUG_OVERFLOW = false;

		static String formatBubblesString(List<Bubble> bubbles, Bubble selected) {
		StringBuilder sb = new StringBuilder();
		for (Bubble bubble : bubbles) {
		if (bubble == null) {
		sb.append(" <null> !!!!!\n");
		} else {
		boolean isSelected = (selected != null && bubble == selected);
		String arrow = isSelected ? "=>" : " ";
		sb.append(String.format("%s Bubble{act=%12d, ongoing=%d, key=%s}\n",
		arrow,
		bubble.getLastActivity(),
		(bubble.isOngoing() ? 1 : 0),
		bubble.getKey()));
		}
		}
		return sb.toString();
		}
		}