PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Output switcher subtitle modification" into rvc-dev

Browse Source
This commit is contained in:
tim peng
2020-04-14 01:56:06 +00:00
committed by Android (Google) Code Review
parent c858484fe6 eb0531f0df
commit 2c9d412ba2
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/panel/MediaOutputPanel.java
View File

@@ -103,7 +103,7 @@ public class MediaOutputPanel implements PanelContent, LocalMediaManager.DeviceC
return metadata.getDescription().getSubtitle(); return metadata.getDescription().getSubtitle();
} }
} }
return null; return mContext.getText(R.string.media_output_panel_title);
} }
@Override @Override

16
tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java
View File

@@ -35,7 +35,6 @@ import android.media.session.MediaController;
import android.media.session.MediaSessionManager; import android.media.session.MediaSessionManager;
import android.media.session.PlaybackState; import android.media.session.PlaybackState;
import android.net.Uri; import android.net.Uri;
import android.text.TextUtils;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.slices.CustomSliceRegistry; import com.android.settings.slices.CustomSliceRegistry;
@@ -238,28 +237,31 @@ public class MediaOutputPanelTest {
} }
@Test @Test
public void getSubTitle_noMetadata_returnEmpty() { public void getSubTitle_noMetadata_returnDefault() {
when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGENAME); when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGENAME);
when(mMediaController.getMetadata()).thenReturn(null); when(mMediaController.getMetadata()).thenReturn(null);
assertThat(TextUtils.isEmpty(mPanel.getSubTitle())).isTrue(); assertThat(mPanel.getSubTitle()).isEqualTo(mContext.getText(
R.string.media_output_panel_title));
} }
@Test @Test
public void getSubTitle_noPackageName_returnEmpty() { public void getSubTitle_noPackageName_returnDefault() {
mPanel = MediaOutputPanel.create(mContext, null); mPanel = MediaOutputPanel.create(mContext, null);
when(mMediaController.getMetadata()).thenReturn(mMediaMetadata); when(mMediaController.getMetadata()).thenReturn(mMediaMetadata);
assertThat(TextUtils.isEmpty(mPanel.getSubTitle())).isTrue(); assertThat(mPanel.getSubTitle()).isEqualTo(mContext.getText(
R.string.media_output_panel_title));
} }
@Test @Test
public void getSubTitle_noController_returnEmpty() { public void getSubTitle_noController_returnDefault() {
mMediaControllers.clear(); mMediaControllers.clear();
mPanel = MediaOutputPanel.create(mContext, TEST_PACKAGENAME); mPanel = MediaOutputPanel.create(mContext, TEST_PACKAGENAME);
when(mMediaController.getMetadata()).thenReturn(mMediaMetadata); when(mMediaController.getMetadata()).thenReturn(mMediaMetadata);
assertThat(TextUtils.isEmpty(mPanel.getSubTitle())).isTrue(); assertThat(mPanel.getSubTitle()).isEqualTo(mContext.getText(
R.string.media_output_panel_title));
} }
@Test @Test