From eb0531f0dfc484cbe277a4466662c21fabe54121 Mon Sep 17 00:00:00 2001 From: Tim Peng Date: Mon, 13 Apr 2020 15:25:33 +0800 Subject: [PATCH] Output switcher subtitle modification -Change from null to "Switch output" -Update test case Bug: 153834179 Test: make -j42 RunSettingsRoboTests Change-Id: I184e78292e982f8a93b74612331a1d2cab28d07a --- .../android/settings/panel/MediaOutputPanel.java | 2 +- .../settings/panel/MediaOutputPanelTest.java | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/panel/MediaOutputPanel.java b/src/com/android/settings/panel/MediaOutputPanel.java index 56ed6fbe8ce..1bf6f26ece5 100644 --- a/src/com/android/settings/panel/MediaOutputPanel.java +++ b/src/com/android/settings/panel/MediaOutputPanel.java @@ -103,7 +103,7 @@ public class MediaOutputPanel implements PanelContent, LocalMediaManager.DeviceC return metadata.getDescription().getSubtitle(); } } - return null; + return mContext.getText(R.string.media_output_panel_title); } @Override diff --git a/tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java b/tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java index e0b926b8a68..cdfa87f05fd 100644 --- a/tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java +++ b/tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java @@ -35,7 +35,6 @@ import android.media.session.MediaController; import android.media.session.MediaSessionManager; import android.media.session.PlaybackState; import android.net.Uri; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.slices.CustomSliceRegistry; @@ -238,28 +237,31 @@ public class MediaOutputPanelTest { } @Test - public void getSubTitle_noMetadata_returnEmpty() { + public void getSubTitle_noMetadata_returnDefault() { when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGENAME); when(mMediaController.getMetadata()).thenReturn(null); - assertThat(TextUtils.isEmpty(mPanel.getSubTitle())).isTrue(); + assertThat(mPanel.getSubTitle()).isEqualTo(mContext.getText( + R.string.media_output_panel_title)); } @Test - public void getSubTitle_noPackageName_returnEmpty() { + public void getSubTitle_noPackageName_returnDefault() { mPanel = MediaOutputPanel.create(mContext, null); when(mMediaController.getMetadata()).thenReturn(mMediaMetadata); - assertThat(TextUtils.isEmpty(mPanel.getSubTitle())).isTrue(); + assertThat(mPanel.getSubTitle()).isEqualTo(mContext.getText( + R.string.media_output_panel_title)); } @Test - public void getSubTitle_noController_returnEmpty() { + public void getSubTitle_noController_returnDefault() { mMediaControllers.clear(); mPanel = MediaOutputPanel.create(mContext, TEST_PACKAGENAME); when(mMediaController.getMetadata()).thenReturn(mMediaMetadata); - assertThat(TextUtils.isEmpty(mPanel.getSubTitle())).isTrue(); + assertThat(mPanel.getSubTitle()).isEqualTo(mContext.getText( + R.string.media_output_panel_title)); } @Test