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

Commit be65de9f authored by Shaowei Shen's avatar Shaowei Shen Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: Downbranch merge conflict[Output Swithcer] Update color" into tm-dev

parents 387d9ee3 2460ef43

packages/SystemUI/res/drawable/ic_circular_unchecked.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@ 
    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

      android:fillColor="@color/media_dialog_inactive_item_main_content"

      android:fillColor="@color/media_dialog_item_main_content"

      android:pathData="M12,22q-2.075,0 -3.9,-0.788 -1.825,-0.787 -3.175,-2.137 -1.35,-1.35 -2.137,-3.175Q2,14.075 2,12t0.788,-3.9q0.787,-1.825 2.137,-3.175 1.35,-1.35 3.175,-2.137Q9.925,2 12,2t3.9,0.788q1.825,0.787 3.175,2.137 1.35,1.35 2.137,3.175Q22,9.925 22,12t-0.788,3.9q-0.787,1.825 -2.137,3.175 -1.35,1.35 -3.175,2.137Q14.075,22 12,22zM12,12zM12,20q3.325,0 5.663,-2.337Q20,15.325 20,12t-2.337,-5.662Q15.325,4 12,4T6.338,6.338Q4,8.675 4,12q0,3.325 2.338,5.663Q8.675,20 12,20z"/>

</vector>

packages/SystemUI/res/drawable/media_output_status_check.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ 
        android:viewportHeight="24"

        android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="@color/media_dialog_item_status"

        android:fillColor="@color/media_dialog_item_main_content"

        android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>

</vector>

packages/SystemUI/res/drawable/media_output_status_failed.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ 
        android:viewportHeight="24"

        android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="@color/media_dialog_inactive_item_main_content"

        android:fillColor="@color/media_dialog_item_main_content"

        android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>

</vector>

packages/SystemUI/res/layout/media_output_list_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ 
                android:ellipsize="end"

                android:maxLines="1"

                android:fontFamily="@*android:string/config_headlineFontFamilyMedium"

                android:textColor="@color/media_dialog_inactive_item_main_content"

                android:textColor="@color/media_dialog_item_main_content"

                android:textSize="16sp"/>

            <TextView

                android:id="@+id/subtitle"
@@ -91,7 +91,7 @@ 
                android:layout_height="wrap_content"

                android:ellipsize="end"

                android:maxLines="1"

                android:textColor="@color/media_dialog_inactive_item_main_content"

                android:textColor="@color/media_dialog_item_main_content"

                android:textSize="14sp"

                android:fontFamily="@*android:string/config_bodyFontFamily"

                android:visibility="gone"/>

packages/SystemUI/res/values-night/colors.xml

+6 −4
Original line number Diff line number Diff line
@@ -67,10 +67,12 @@ 


    <!-- media output dialog-->

    <color name="media_dialog_background">@color/material_dynamic_neutral10</color>

    <color name="media_dialog_active_item_main_content">@color/material_dynamic_neutral10</color>

    <color name="media_dialog_inactive_item_main_content">@color/material_dynamic_neutral10</color>

    <color name="media_dialog_item_status">@color/material_dynamic_neutral10</color>

    <color name="media_dialog_item_background">@color/material_dynamic_secondary95</color>

    <color name="media_dialog_item_main_content">@color/material_dynamic_primary90</color>

    <color name="media_dialog_item_background">@color/material_dynamic_neutral_variant20</color>

    <color name="media_dialog_connected_item_background">@color/material_dynamic_secondary20</color>

    <color name="media_dialog_seekbar_progress">@color/material_dynamic_secondary40</color>

    <color name="media_dialog_button_background">@color/material_dynamic_primary70</color>

    <color name="media_dialog_solid_button_text">@color/material_dynamic_secondary20</color>



    <!-- Biometric dialog colors -->

    <color name="biometric_dialog_gray">#ffcccccc</color>