From 5bb867d9d4a613cb40f8aabb1033f8effa140dd0 Mon Sep 17 00:00:00 2001 From: shaoweishen Date: Mon, 17 Jan 2022 14:49:45 +0000 Subject: [PATCH] [Output Switcher] Bring back "Pair new device" item revert miss-delete section for adding "Pair new device" item Test: verified on device Bug: 213251197 Change-Id: I392bc32d0574f7a4fa94b3e52204414f7d02fed8 --- .../com/android/systemui/media/dialog/MediaOutputAdapter.java | 4 ++++ .../android/systemui/media/dialog/MediaOutputAdapterTest.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java index e465ae41f546f..85c9644b602a0 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.java @@ -77,6 +77,10 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { @Override public int getItemCount() { + if (mController.isZeroMode()) { + // Add extra one for "pair new" or dynamic group + return mController.getMediaDevices().size() + 1; + } return mController.getMediaDevices().size(); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java index 89c0712cdc7d3..421ae034c0542 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java @@ -100,7 +100,7 @@ public class MediaOutputAdapterTest extends SysuiTestCase { public void getItemCount_zeroMode_containExtraOneForPairNew() { when(mMediaOutputController.isZeroMode()).thenReturn(true); - assertThat(mMediaOutputAdapter.getItemCount()).isEqualTo(mMediaDevices.size()); + assertThat(mMediaOutputAdapter.getItemCount()).isEqualTo(mMediaDevices.size() + 1); } @Test