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

Commit 79885c9f authored by Caitlin Cassidy's avatar Caitlin Cassidy Committed by Automerger Merge Worker
Browse files

Merge "[Media] Update paging indicator to be light gray." into tm-dev am: 7b942753 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17802068



Change-Id: I9e6edb764b1ee936a63831c2b82d474ac1c259a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2c2a6f5f 7b942753

packages/SystemUI/res/layout/media_carousel.xml

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="48dp"

        android:layout_marginBottom="4dp"

        android:tint="?android:attr/textColor"

        android:tint="@color/media_paging_indicator"

        android:forceHasOverlappingRendering="false"

    />

</FrameLayout>

packages/SystemUI/res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ 


    <!-- media -->

    <color name="media_seamless_border">?android:attr/colorAccent</color>

    <color name="media_paging_indicator">@color/material_dynamic_neutral_variant80</color>



    <!-- media output dialog-->

    <color name="media_dialog_background" android:lstar="98">@color/material_dynamic_neutral90</color>

packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt

+3 −1
Original line number Diff line number Diff line
@@ -533,7 +533,9 @@ class MediaCarouselController @Inject constructor( 
    }



    private fun recreatePlayers() {

        pageIndicator.tintList = ColorStateList.valueOf(R.color.material_dynamic_neutral_variant80)

        pageIndicator.tintList = ColorStateList.valueOf(

            context.getColor(R.color.media_paging_indicator)

        )



        MediaPlayerData.mediaData().forEach { (key, data, isSsMediaRec) ->

            if (isSsMediaRec) {