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

Commit 02d59e77 authored by James O'Leary's avatar James O'Leary
Browse files

Media output selector chip color updated per designers 

P-T80/A1-200 in light mode
P-T90/A1-100 in dark mode

Bug: 213314628
Test: Manual inspection at runtime flip between light mode and dark mode
observe chip is darker in light mode. atest --no-bazel-mode 
ColorSchemeTransitionTest
Change-Id: Ie2b3140e39764039742461d1571c40c596ca6c15
parent abfe2878

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

+16 −1
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ import android.content.res.ColorStateList 
import android.graphics.Color

import android.graphics.drawable.GradientDrawable

import android.graphics.drawable.RippleDrawable

import android.content.res.Configuration

import android.content.res.Configuration.UI_MODE_NIGHT_YES

import com.android.internal.R

import com.android.internal.annotations.VisibleForTesting

import com.android.settingslib.Utils
@@ -124,7 +126,6 @@ class ColorSchemeTransition internal constructor( 
        val accentColorList = ColorStateList.valueOf(accentPrimary)

        mediaViewHolder.actionPlayPause.backgroundTintList = accentColorList

        mediaViewHolder.gutsViewHolder.setAccentPrimaryColor(accentPrimary)

        mediaViewHolder.seamlessButton.backgroundTintList = accentColorList

    }



    val accentSecondary = animatingColorTransitionFactory(
@@ -138,6 +139,19 @@ class ColorSchemeTransition internal constructor( 
        }

    }



    val colorSeamless = animatingColorTransitionFactory(

        loadDefaultColor(R.attr.textColorPrimary),

        { colorScheme: ColorScheme ->

            // A1-100 dark in dark theme, A1-200 in light theme

            if (context.resources.configuration.uiMode and

                    Configuration.UI_MODE_NIGHT_MASK == UI_MODE_NIGHT_YES)

                        colorScheme.accent1[2]

                        else colorScheme.accent1[3]

        }, { seamlessColor: Int ->

            val accentColorList = ColorStateList.valueOf(seamlessColor)

            mediaViewHolder.seamlessButton.backgroundTintList = accentColorList

    })



    val textPrimary = animatingColorTransitionFactory(

        loadDefaultColor(R.attr.textColorPrimary),

        ::textPrimaryFromScheme
@@ -185,6 +199,7 @@ class ColorSchemeTransition internal constructor( 


    val colorTransitions = arrayOf(

        surfaceColor,

        colorSeamless,

        accentPrimary,

        accentSecondary,

        textPrimary,

packages/SystemUI/tests/src/com/android/systemui/media/ColorSchemeTransitionTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -146,6 +146,6 @@ class ColorSchemeTransitionTest : SysuiTestCase() { 
    @Test

    fun testColorSchemeTransition_update() {

        colorSchemeTransition.updateColorScheme(colorScheme, true)

        verify(mockAnimatingTransition, times(9)).updateColorScheme(colorScheme)

        verify(mockAnimatingTransition, times(10)).updateColorScheme(colorScheme)

    }

}