From cf3dc8931728917a6be919909380fff1a98007c0 Mon Sep 17 00:00:00 2001 From: Beth Thibodeau Date: Thu, 6 Jan 2022 18:46:11 -0500 Subject: [PATCH] Add carousel size info to dumpsys Adds the media size, location, and state to dumpsys. This should help debugging issues where the carousel doesn't display as expected. Bug: 198319256 Test: manual - dumpsys activity service SystemUI, verify info Test: atest QSPanelControllerBaseTest Change-Id: I76a88d583bd0dbee4a65af20c628ca0bf69671b3 --- .../src/com/android/systemui/media/MediaCarouselController.kt | 4 ++++ .../src/com/android/systemui/qs/QSPanelControllerBase.java | 3 +++ .../com/android/systemui/qs/QSPanelControllerBaseTest.java | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt index ce3b443e677eb..29321b46328aa 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt @@ -865,6 +865,10 @@ class MediaCarouselController @Inject constructor( println("playerKeys: ${MediaPlayerData.playerKeys()}") println("smartspaceMediaData: ${MediaPlayerData.smartspaceMediaData}") println("shouldPrioritizeSs: ${MediaPlayerData.shouldPrioritizeSs}") + println("current size: $currentCarouselWidth x $currentCarouselHeight") + println("location: $desiredLocation") + println("state: ${desiredHostState?.expansion}, " + + "only active ${desiredHostState?.showsOnlyActiveMedia}") } } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java index d470fa242f713..f22ad498a0530 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java @@ -391,6 +391,9 @@ public abstract class QSPanelControllerBase extends ViewContr pw.print(" "); pw.println(record.tileView.toString()); } } + if (mMediaHost != null) { + pw.println(" media bounds: " + mMediaHost.getCurrentBounds()); + } } public QSPanel.QSTileLayout getTileLayout() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerBaseTest.java index 2e1fb07e6aa5f..8ccf5596b0ec0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelControllerBaseTest.java @@ -218,7 +218,8 @@ public class QSPanelControllerBaseTest extends SysuiTestCase { String expected = "TestableQSPanelControllerBase:\n" + " Tile records:\n" + " " + mockTileString + "\n" - + " " + mockTileViewString + "\n"; + + " " + mockTileViewString + "\n" + + " media bounds: null\n"; assertEquals(expected, w.getBuffer().toString()); }