Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb0531f0 authored by Tim Peng's avatar Tim Peng Committed by tim peng
Browse files

Output switcher subtitle modification 

-Change from null to "Switch output"
-Update test case

Bug: 153834179
Test: make -j42 RunSettingsRoboTests
Change-Id: I184e78292e982f8a93b74612331a1d2cab28d07a
parent 545f08e8

src/com/android/settings/panel/MediaOutputPanel.java

+1 −1
Original line number Diff line number Diff line
@@ -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

tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java

+9 −7
Original line number Diff line number Diff line
@@ -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