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

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

Merge "Update media typefaces" into main

parents a08ef756 b808a556

packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaViewController.kt

+4 −2
Original line number Diff line number Diff line
@@ -33,9 +33,10 @@ import com.android.systemui.media.controls.ui.controller.MediaCarouselController 
import com.android.systemui.media.controls.ui.view.GutsViewHolder

import com.android.systemui.media.controls.ui.view.MediaHostState

import com.android.systemui.media.controls.ui.view.MediaViewHolder

import com.android.systemui.media.controls.ui.view.MediaViewHolder.Companion.bodyMediumTF

import com.android.systemui.media.controls.ui.view.MediaViewHolder.Companion.headlineSmallTF

import com.android.systemui.media.controls.ui.view.MediaViewHolder.Companion.labelLargeTF

import com.android.systemui.media.controls.ui.view.MediaViewHolder.Companion.labelMediumTF

import com.android.systemui.media.controls.ui.view.MediaViewHolder.Companion.titleMediumEmphasizedTF

import com.android.systemui.media.controls.ui.view.MediaViewHolder.Companion.titleMediumTF

import com.android.systemui.media.controls.ui.viewmodel.SeekBarViewModel

import com.android.systemui.media.remedia.shared.flag.MediaControlsInComposeFlag
@@ -748,7 +749,8 @@ constructor( 
        when (location) {

            MediaHierarchyManager.LOCATION_COMMUNAL_HUB ->

                viewHolder?.updateFontFamily(headlineSmallTF, titleMediumTF, labelMediumTF)

            else -> viewHolder?.updateFontFamily(titleMediumTF, labelLargeTF, labelMediumTF)

            else ->

                viewHolder?.updateFontFamily(titleMediumEmphasizedTF, bodyMediumTF, labelMediumTF)

        }

    }

packages/SystemUI/src/com/android/systemui/media/controls/ui/view/MediaViewHolder.kt

+5 −2
Original line number Diff line number Diff line
@@ -28,10 +28,11 @@ import android.widget.TextView 
import androidx.constraintlayout.widget.Barrier

import com.android.internal.widget.CachingIconView

import com.android.systemui.Flags.enableSuggestedDeviceUi

import com.android.systemui.FontStyles.GSF_BODY_MEDIUM

import com.android.systemui.FontStyles.GSF_HEADLINE_SMALL

import com.android.systemui.FontStyles.GSF_LABEL_LARGE

import com.android.systemui.FontStyles.GSF_LABEL_MEDIUM

import com.android.systemui.FontStyles.GSF_TITLE_MEDIUM

import com.android.systemui.FontStyles.GSF_TITLE_MEDIUM_EMPHASIZED

import com.android.systemui.res.R

import com.android.systemui.surfaceeffects.loadingeffect.LoadingEffectView

import com.android.systemui.surfaceeffects.ripple.MultiRippleView
@@ -207,8 +208,10 @@ class MediaViewHolder constructor(itemView: View) { 
            )



        val headlineSmallTF: Typeface = Typeface.create(GSF_HEADLINE_SMALL, Typeface.NORMAL)

        val titleMediumEmphasizedTF: Typeface =

            Typeface.create(GSF_TITLE_MEDIUM_EMPHASIZED, Typeface.NORMAL)

        val titleMediumTF: Typeface = Typeface.create(GSF_TITLE_MEDIUM, Typeface.NORMAL)

        val labelMediumTF: Typeface = Typeface.create(GSF_LABEL_MEDIUM, Typeface.NORMAL)

        val labelLargeTF: Typeface = Typeface.create(GSF_LABEL_LARGE, Typeface.NORMAL)

        val bodyMediumTF: Typeface = Typeface.create(GSF_BODY_MEDIUM, Typeface.NORMAL)

    }

}