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

Commit 8ee1902b authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB][Screen Chips] Allow different chips to have different colors. 

This sets the call chip to have a "themed" look (its coloring matches
whatever theme color is set) and sets all the screen sharing chips to
have a "red" look (always dark red background with white text).

Bug: 332662551
Flag: com.android.systemui.status_bar_screen_sharing_chips

Test: Cast-to-other-device chip, share-to-app chip, and screen recording
chip all have red coloring. Change between light & dark mode and verify
chip always stays same color. Change theme color and verify chip always
stays same color.
Test: Call chip has themed coloring
Test: Start a call, then change theme colors -> verify call chip updates
to new color

Test: Start a call, then start screen recording -> verify chip coloring
changes
Test: Then, change theme colors. Then, end the screen recording ->
verify call chip reappears in the new theme colors

Change-Id: I43ca05c48a9fdcaf3f00b4c62e7d0fc10a43c3f2
parent e093a979

packages/SystemUI/src/com/android/systemui/statusbar/chips/call/ui/viewmodel/CallChipViewModel.kt

+2 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import com.android.systemui.dagger.qualifiers.Application 
import com.android.systemui.plugins.ActivityStarter

import com.android.systemui.plugins.ActivityStarter

import com.android.systemui.res.R

import com.android.systemui.res.R

import com.android.systemui.statusbar.chips.call.domain.interactor.CallChipInteractor

import com.android.systemui.statusbar.chips.call.domain.interactor.CallChipInteractor

import com.android.systemui.statusbar.chips.ui.model.ColorsModel

import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer

import com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel
@@ -65,6 +66,7 @@ constructor( 
                                    com.android.internal.R.drawable.ic_phone,

                                    com.android.internal.R.drawable.ic_phone,

                                    contentDescription = null,

                                    contentDescription = null,

                                ),

                                ),

                            colors = ColorsModel.Themed,

                            startTimeMs = startTimeInElapsedRealtime,

                            startTimeMs = startTimeInElapsedRealtime,

                        ) {

                        ) {

                            if (state.intent != null) {

                            if (state.intent != null) {

packages/SystemUI/src/com/android/systemui/statusbar/chips/casttootherdevice/ui/viewmodel/CastToOtherDeviceChipViewModel.kt

+2 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.systemui.statusbar.chips.casttootherdevice.ui.view.EndCastToO 
import com.android.systemui.statusbar.chips.mediaprojection.domain.interactor.MediaProjectionChipInteractor

import com.android.systemui.statusbar.chips.mediaprojection.domain.interactor.MediaProjectionChipInteractor

import com.android.systemui.statusbar.chips.mediaprojection.domain.model.ProjectionChipModel

import com.android.systemui.statusbar.chips.mediaprojection.domain.model.ProjectionChipModel

import com.android.systemui.statusbar.chips.mediaprojection.ui.view.EndMediaProjectionDialogHelper

import com.android.systemui.statusbar.chips.mediaprojection.ui.view.EndMediaProjectionDialogHelper

import com.android.systemui.statusbar.chips.ui.model.ColorsModel

import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel.Companion.createDialogLaunchOnClickListener

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel.Companion.createDialogLaunchOnClickListener
@@ -85,6 +86,7 @@ constructor( 
                    CAST_TO_OTHER_DEVICE_ICON,

                    CAST_TO_OTHER_DEVICE_ICON,

                    ContentDescription.Resource(R.string.accessibility_casting),

                    ContentDescription.Resource(R.string.accessibility_casting),

                ),

                ),

            colors = ColorsModel.Red,

            // TODO(b/332662551): Maybe use a MediaProjection API to fetch this time.

            // TODO(b/332662551): Maybe use a MediaProjection API to fetch this time.

            startTimeMs = systemClock.elapsedRealtime(),

            startTimeMs = systemClock.elapsedRealtime(),

            createDialogLaunchOnClickListener(

            createDialogLaunchOnClickListener(

packages/SystemUI/src/com/android/systemui/statusbar/chips/screenrecord/ui/viewmodel/ScreenRecordChipViewModel.kt

+2 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.systemui.statusbar.chips.mediaprojection.ui.view.EndMediaProj 
import com.android.systemui.statusbar.chips.screenrecord.domain.interactor.ScreenRecordChipInteractor

import com.android.systemui.statusbar.chips.screenrecord.domain.interactor.ScreenRecordChipInteractor

import com.android.systemui.statusbar.chips.screenrecord.domain.model.ScreenRecordChipModel

import com.android.systemui.statusbar.chips.screenrecord.domain.model.ScreenRecordChipModel

import com.android.systemui.statusbar.chips.screenrecord.ui.view.EndScreenRecordingDialogDelegate

import com.android.systemui.statusbar.chips.screenrecord.ui.view.EndScreenRecordingDialogDelegate

import com.android.systemui.statusbar.chips.ui.model.ColorsModel

import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel.Companion.createDialogLaunchOnClickListener

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel.Companion.createDialogLaunchOnClickListener
@@ -60,6 +61,7 @@ constructor( 
                        OngoingActivityChipModel.Shown(

                        OngoingActivityChipModel.Shown(

                            // TODO(b/332662551): Also provide a content description.

                            // TODO(b/332662551): Also provide a content description.

                            icon = Icon.Resource(ICON, contentDescription = null),

                            icon = Icon.Resource(ICON, contentDescription = null),

                            colors = ColorsModel.Red,

                            startTimeMs = systemClock.elapsedRealtime(),

                            startTimeMs = systemClock.elapsedRealtime(),

                            createDialogLaunchOnClickListener(

                            createDialogLaunchOnClickListener(

                                createDelegate(state.recordedTask),

                                createDelegate(state.recordedTask),

packages/SystemUI/src/com/android/systemui/statusbar/chips/sharetoapp/ui/viewmodel/ShareToAppChipViewModel.kt

+2 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import com.android.systemui.statusbar.chips.mediaprojection.domain.interactor.Me 
import com.android.systemui.statusbar.chips.mediaprojection.domain.model.ProjectionChipModel

import com.android.systemui.statusbar.chips.mediaprojection.domain.model.ProjectionChipModel

import com.android.systemui.statusbar.chips.mediaprojection.ui.view.EndMediaProjectionDialogHelper

import com.android.systemui.statusbar.chips.mediaprojection.ui.view.EndMediaProjectionDialogHelper

import com.android.systemui.statusbar.chips.sharetoapp.ui.view.EndShareToAppDialogDelegate

import com.android.systemui.statusbar.chips.sharetoapp.ui.view.EndShareToAppDialogDelegate

import com.android.systemui.statusbar.chips.ui.model.ColorsModel

import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel.Companion.createDialogLaunchOnClickListener

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel.Companion.createDialogLaunchOnClickListener
@@ -78,6 +79,7 @@ constructor( 
        return OngoingActivityChipModel.Shown(

        return OngoingActivityChipModel.Shown(

            // TODO(b/332662551): Use the right content description.

            // TODO(b/332662551): Use the right content description.

            icon = Icon.Resource(SHARE_TO_APP_ICON, contentDescription = null),

            icon = Icon.Resource(SHARE_TO_APP_ICON, contentDescription = null),

            colors = ColorsModel.Red,

            // TODO(b/332662551): Maybe use a MediaProjection API to fetch this time.

            // TODO(b/332662551): Maybe use a MediaProjection API to fetch this time.

            startTimeMs = systemClock.elapsedRealtime(),

            startTimeMs = systemClock.elapsedRealtime(),

            createDialogLaunchOnClickListener(

            createDialogLaunchOnClickListener(

packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/model/ColorsModel.kt

0 → 100644
+49 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.statusbar.chips.ui.model



import android.content.Context

import android.content.res.ColorStateList

import androidx.annotation.ColorInt

import com.android.settingslib.Utils

import com.android.systemui.res.R



/** Model representing how the chip in the status bar should be colored. */

sealed interface ColorsModel {

    /** The color for the background of the chip. */

    fun background(context: Context): ColorStateList



    /** The color for the text (and icon) on the chip. */

    @ColorInt fun text(context: Context): Int



    /** The chip should match the theme's primary color. */

    data object Themed : ColorsModel {

        override fun background(context: Context): ColorStateList =

            Utils.getColorAttr(context, com.android.internal.R.attr.colorAccent)



        override fun text(context: Context) =

            Utils.getColorAttrDefaultColor(context, com.android.internal.R.attr.colorPrimary)

    }



    /** The chip should have a red background with white text. */

    data object Red : ColorsModel {

        override fun background(context: Context): ColorStateList =

            ColorStateList.valueOf(context.getColor(R.color.GM2_red_600))



        override fun text(context: Context) = context.getColor(android.R.color.white)

    }

}