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

Commit 25a5ca4e authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Android (Google) Code Review
Browse files

Merge "Update resume button content description" into main

parents a569fddd b40b157e

packages/SystemUI/res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -3181,8 +3181,6 @@ 
    <string name="controls_media_active_session">The current media session cannot be hidden.</string>

    <!-- Label for a button that will hide media controls [CHAR_LIMIT=30] -->

    <string name="controls_media_dismiss_button">Hide</string>

    <!-- Label for button to resume media playback [CHAR_LIMIT=NONE] -->

    <string name="controls_media_resume">Resume</string>

    <!-- Label for button to go to media control settings screen [CHAR_LIMIT=30] -->

    <string name="controls_media_settings_button">Settings</string>

    <!-- Description for media control's playing media item, including information for the media's title, the artist, and source app [CHAR LIMIT=NONE]-->

packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImpl.kt

+1 −1
Original line number Diff line number Diff line
@@ -1256,7 +1256,7 @@ class LegacyMediaDataManagerImpl( 
        return MediaAction(

            Icon.createWithResource(context, iconId).setTint(themeText).loadDrawable(context),

            action,

            context.getString(R.string.controls_media_resume),

            context.getString(R.string.controls_media_button_play),

            if (Flags.mediaControlsUiUpdate()) {

                context.getDrawable(R.drawable.ic_media_play_button_container)

            } else {

packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataLoader.kt

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ constructor( 
        return MediaAction(

            Icon.createWithResource(context, iconId).setTint(themeText).loadDrawable(context),

            action,

            context.getString(R.string.controls_media_resume),

            context.getString(R.string.controls_media_button_play),

            if (Flags.mediaControlsUiUpdate()) {

                context.getDrawable(R.drawable.ic_media_play_button_container)

            } else {

packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessor.kt

+1 −1
Original line number Diff line number Diff line
@@ -1193,7 +1193,7 @@ class MediaDataProcessor( 
        return MediaAction(

            Icon.createWithResource(context, iconId).setTint(themeText).loadDrawable(context),

            action,

            context.getString(R.string.controls_media_resume),

            context.getString(R.string.controls_media_button_play),

            if (Flags.mediaControlsUiUpdate()) {

                context.getDrawable(R.drawable.ic_media_play_button_container)

            } else {