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

Commit cf48e278 authored by Beth Thibodeau's avatar Beth Thibodeau
Browse files

Update resume icon and colors 

Use grayscale launcher icon when in resume state
Adjust accent color used for output switcher and active (notif) app icon

Test: visual
Test: atest com.android.systemui.media
Fixes: 185681682
Fixes: 176177555
Change-Id: Idf358dfd7111f3910367960d6cff5e26cd7889c6
parent 90cff49c

packages/SystemUI/res/color/media_player_solid_button_bg.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 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.

  -->



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

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

    <item android:color="?androidprv:attr/colorAccentTertiary"/>

</selector>
 
 No newline at end of file

packages/SystemUI/res/layout/media_smartspace_recommendations.xml

+6 −6
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
        android:id="@+id/media_logo1"

        android:layout_width="@dimen/qs_media_icon_size"

        android:layout_height="@dimen/qs_media_icon_size"

        style="@style/MediaPlayer.AppIcon.Recommendation" />

        style="@style/MediaPlayer.AppIcon" />



    <ImageView

        android:id="@+id/media_cover2"
@@ -91,7 +91,7 @@ 
        android:id="@+id/media_logo2"

        android:layout_width="@dimen/qs_media_icon_size"

        android:layout_height="@dimen/qs_media_icon_size"

        style="@style/MediaPlayer.AppIcon.Recommendation" />

        style="@style/MediaPlayer.AppIcon" />



    <ImageView

        android:id="@+id/media_cover3"
@@ -107,7 +107,7 @@ 
        android:id="@+id/media_logo3"

        android:layout_width="@dimen/qs_media_icon_size"

        android:layout_height="@dimen/qs_media_icon_size"

        style="@style/MediaPlayer.AppIcon.Recommendation" />

        style="@style/MediaPlayer.AppIcon" />



    <ImageView

        android:id="@+id/media_cover4"
@@ -123,7 +123,7 @@ 
        android:id="@+id/media_logo4"

        android:layout_width="@dimen/qs_media_icon_size"

        android:layout_height="@dimen/qs_media_icon_size"

        style="@style/MediaPlayer.AppIcon.Recommendation" />

        style="@style/MediaPlayer.AppIcon" />



    <ImageView

        android:id="@+id/media_cover5"
@@ -139,7 +139,7 @@ 
        android:id="@+id/media_logo5"

        android:layout_width="@dimen/qs_media_icon_size"

        android:layout_height="@dimen/qs_media_icon_size"

        style="@style/MediaPlayer.AppIcon.Recommendation" />

        style="@style/MediaPlayer.AppIcon" />



    <ImageView

        android:id="@+id/media_cover6"
@@ -155,7 +155,7 @@ 
        android:id="@+id/media_logo6"

        android:layout_width="@dimen/qs_media_icon_size"

        android:layout_height="@dimen/qs_media_icon_size"

        style="@style/MediaPlayer.AppIcon.Recommendation" />

        style="@style/MediaPlayer.AppIcon" />



    <!-- Long press menu -->

    <TextView

packages/SystemUI/res/layout/media_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ 
                android:layout_width="@dimen/qs_seamless_icon_size"

                android:layout_height="@dimen/qs_seamless_icon_size"

                android:layout_gravity="center"

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

                android:src="@*android:drawable/ic_media_seamless" />

            <TextView

                android:id="@+id/media_seamless_text"

packages/SystemUI/res/values/styles.xml

+3 −8
Original line number Diff line number Diff line
@@ -649,19 +649,14 @@ 
    </style>



    <style name="MediaPlayer.SolidButton">

        <item name="android:backgroundTint">?android:attr/colorAccent</item>

        <item name="android:backgroundTint">@color/media_player_solid_button_bg</item>

        <item name="android:tint">?android:attr/colorPrimary</item>

        <item name="android:textColor">?android:attr/colorPrimary</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

    </style>



    <style name="MediaPlayer.AppIcon">

        <item name="android:background">@drawable/qs_media_icon_background</item>

        <item name="android:backgroundTint">?android:attr/colorPrimary</item>

        <item name="android:tint">?android:attr/colorAccent</item>

    </style>



    <style name="MediaPlayer.AppIcon.Recommendation" parent="MediaPlayer.AppIcon">

        <item name="android:tint">@color/transparent</item>

        <item name="android:backgroundTint">?android:attr/textColorPrimary</item>

    </style>



    <style name="MediaPlayer.Album">

packages/SystemUI/res/xml/media_collapsed.xml

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ 
        android:layout_marginBottom="@dimen/qs_media_padding"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        />



    <!-- Song name -->