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

Commit e7d87a4e authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[Chipbar] Update the colors to make the chipbar stand out more. 

Bug: 267821684
Test: Trigger chipbar -> see new colors (screenshots in bug)
Test: Change theme while chipbar is displayed -> verify chipbar is
re-displayed in the new theme color

Change-Id: I86ff54f931d63f5d8d44e85a8b1f1a4e7c238171
parent 5eb4f21f

packages/SystemUI/res/drawable/chipbar_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
<shape

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <solid android:color="?androidprv:attr/colorSurface" />

    <solid android:color="?androidprv:attr/colorAccentSecondary" />

    <corners android:radius="32dp" />

</shape>

packages/SystemUI/res/drawable/chipbar_end_button_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:color="?android:textColorPrimary">

    <item android:id="@android:id/background">

        <shape>

            <solid android:color="?androidprv:attr/colorAccentPrimary"/>

            <solid android:color="@android:color/system_accent1_200"/>

            <corners android:radius="24dp" />

        </shape>

    </item>

packages/SystemUI/res/layout/chipbar.xml

+3 −3
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:textSize="@dimen/chipbar_text_size"

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

            android:textColor="@android:color/system_accent2_900"

            android:alpha="0.0"

            />
@@ -66,7 +66,7 @@ 
            android:layout_height="@dimen/chipbar_end_icon_size"

            android:layout_marginStart="@dimen/chipbar_end_item_start_margin"

            android:src="@drawable/ic_progress_activity"

            android:tint="?androidprv:attr/colorAccentPrimaryVariant"

            android:tint="@android:color/system_accent2_700"

            android:alpha="0.0"

            />
@@ -76,7 +76,7 @@ 
            android:layout_height="@dimen/chipbar_end_icon_size"

            android:layout_marginStart="@dimen/chipbar_end_item_start_margin"

            android:src="@drawable/ic_warning"

            android:tint="@color/GM2_red_500"

            android:tint="@color/GM2_red_600"

            android:alpha="0.0"

            />

packages/SystemUI/res/values/colors.xml

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


    <color name="GM2_red_300">#F28B82</color>

    <color name="GM2_red_500">#EA4335</color>

    <color name="GM2_red_600">#B3261E</color>

    <color name="GM2_red_700">#C5221F</color>



    <color name="GM2_blue_300">#8AB4F8</color>

packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewDisplayController.kt

+4 −0
Original line number Diff line number Diff line
@@ -294,6 +294,10 @@ abstract class TemporaryViewDisplayController<T : TemporaryViewInfo, U : Tempora 
        override fun onDensityOrFontScaleChanged() {

            reinflateView()

        }



        override fun onThemeChanged() {

            reinflateView()

        }

    }



    private fun addCallbacks() {