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

Commit e50baf05 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Convert tonal palettes to MDC nomenclature"

parents 0a8e38d5 00c1a604

packages/SystemUI/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ android_library { 
        "androidx.dynamicanimation_dynamicanimation",

        "androidx-constraintlayout_constraintlayout",

        "androidx.exifinterface_exifinterface",

        "com.google.android.material_material",

        "kotlinx_coroutines_android",

        "kotlinx_coroutines",

        "iconloader_base",

packages/SystemUI/res-keyguard/drawable/status_bar_user_chip_bg.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ 
  -->



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

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

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

    <corners android:radius="@dimen/ongoing_call_chip_corner_radius" />

</shape>

packages/SystemUI/res/drawable-nodpi/icon_bg.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,5 +14,5 @@ Copyright (C) 2018 The Android Open Source Project 
    limitations under the License.

-->

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

    android:color="@android:color/system_accent1_500" />

    android:color="@color/material_dynamic_primary50" />

packages/SystemUI/res/drawable/media_output_dialog_seekbar_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
                    android:radius="28dp"/>

                <size

                    android:height="64dp"/>

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

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

            </shape>

        </clip>

    </item>

packages/SystemUI/res/layout/screen_record_dialog_audio_source.xml

+2 −2
Original line number Diff line number Diff line
@@ -27,11 +27,11 @@ 
        android:layout_gravity="center_vertical"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textSize="14sp"

        android:textColor="@android:color/system_neutral1_900"/>

        android:textColor="@color/material_dynamic_neutral10"/>

    <TextView

        android:id="@+id/screen_recording_dialog_source_description"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textColor="@android:color/system_neutral2_700"/>

        android:textColor="@color/material_dynamic_neutral_variant30"/>

</LinearLayout>
 
 No newline at end of file