diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp index b1cfb1118bb6a..8cc9e004f7586 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -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", diff --git a/packages/SystemUI/res-keyguard/drawable/status_bar_user_chip_bg.xml b/packages/SystemUI/res-keyguard/drawable/status_bar_user_chip_bg.xml index 989115697d6f2..a751f58344a9a 100644 --- a/packages/SystemUI/res-keyguard/drawable/status_bar_user_chip_bg.xml +++ b/packages/SystemUI/res-keyguard/drawable/status_bar_user_chip_bg.xml @@ -15,6 +15,6 @@ --> - + diff --git a/packages/SystemUI/res/drawable-nodpi/icon_bg.xml b/packages/SystemUI/res/drawable-nodpi/icon_bg.xml index ff7cbae16ab28..f7b0982dfaf8c 100644 --- a/packages/SystemUI/res/drawable-nodpi/icon_bg.xml +++ b/packages/SystemUI/res/drawable-nodpi/icon_bg.xml @@ -14,5 +14,5 @@ Copyright (C) 2018 The Android Open Source Project limitations under the License. --> + android:color="@color/material_dynamic_primary50" /> diff --git a/packages/SystemUI/res/drawable/media_output_dialog_seekbar_background.xml b/packages/SystemUI/res/drawable/media_output_dialog_seekbar_background.xml index 3a228d512fa4d..e1b99ceffbb65 100644 --- a/packages/SystemUI/res/drawable/media_output_dialog_seekbar_background.xml +++ b/packages/SystemUI/res/drawable/media_output_dialog_seekbar_background.xml @@ -30,7 +30,7 @@ android:radius="28dp"/> - + diff --git a/packages/SystemUI/res/layout/screen_record_dialog_audio_source.xml b/packages/SystemUI/res/layout/screen_record_dialog_audio_source.xml index ab600b3758bc4..2567176b2557d 100644 --- a/packages/SystemUI/res/layout/screen_record_dialog_audio_source.xml +++ b/packages/SystemUI/res/layout/screen_record_dialog_audio_source.xml @@ -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"/> + android:textColor="@color/material_dynamic_neutral_variant30"/> \ No newline at end of file diff --git a/packages/SystemUI/res/values-night/colors.xml b/packages/SystemUI/res/values-night/colors.xml index f1e93c274e400..4b96d5d660eeb 100644 --- a/packages/SystemUI/res/values-night/colors.xml +++ b/packages/SystemUI/res/values-night/colors.xml @@ -33,7 +33,7 @@ @*android:color/notification_primary_text_color_dark - @android:color/system_neutral1_50 + @color/material_dynamic_neutral95 @color/GM2_grey_500 @color/GM2_grey_300 @@ -66,15 +66,15 @@ #85ffffff - @android:color/system_neutral1_900 - @android:color/system_neutral1_900 - @android:color/system_neutral1_900 - @android:color/system_neutral1_900 - @android:color/system_accent2_50 + @color/material_dynamic_neutral10 + @color/material_dynamic_neutral10 + @color/material_dynamic_neutral10 + @color/material_dynamic_neutral10 + @color/material_dynamic_secondary95 #ffcccccc - @android:color/system_accent1_300 + @color/material_dynamic_primary70 #fff28b82 @@ -99,5 +99,5 @@ #B3000000 - @android:color/system_accent2_800 + @color/material_dynamic_secondary20 diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index cbda439e5cb2d..f4e7cf3fcf40d 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -87,7 +87,7 @@ @color/GM2_grey_700 #77000000 - @android:color/system_neutral1_900 + @color/material_dynamic_neutral10 @*android:color/text_color_primary_device_default_dark @@ -112,7 +112,7 @@ #99000000 - @android:color/system_neutral1_900 + @color/material_dynamic_neutral10 #fff44336 @@ -131,7 +131,7 @@ #80000000 #ff757575 - @android:color/system_accent1_600 + @color/material_dynamic_primary40 #ffd93025 @@ -175,11 +175,11 @@ ?android:attr/colorAccent - @android:color/system_neutral1_100 - @android:color/system_accent1_900 - @android:color/system_accent1_600 - @android:color/system_accent1_900 - @android:color/system_accent2_50 + @color/material_dynamic_neutral90 + @color/material_dynamic_primary10 + @color/material_dynamic_primary40 + @color/material_dynamic_primary10 + @color/material_dynamic_secondary95 #E6FFFFFF @@ -214,7 +214,7 @@ #33FFFFFF - @android:color/system_accent2_50 + @color/material_dynamic_secondary95 diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 09ae3f9e3376b..9d65c38958277 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -296,7 +296,7 @@ @style/DualToneDarkTheme @*android:color/primary_text_material_dark @*android:color/secondary_text_material_dark - @*android:color/system_accent1_100 + @color/material_dynamic_primary90 @*android:color/error_color_material_dark @style/LockPatternStyle @style/PasswordTheme @@ -312,7 +312,7 @@ @@ -578,7 +578,7 @@ diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt index ecaa142f8a095..83ad027baf28d 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt @@ -540,14 +540,14 @@ class MediaCarouselController @Inject constructor( } private fun getBackgroundColor(): Int { - return context.getColor(android.R.color.system_accent2_50) + return context.getColor(R.color.material_dynamic_secondary95) } private fun getForegroundColor(): Int { return if (mediaFlags.useMediaSessionLayout()) { - context.getColor(android.R.color.system_neutral2_200) + context.getColor(R.color.material_dynamic_neutral_variant80) } else { - context.getColor(android.R.color.system_accent2_900) + context.getColor(R.color.material_dynamic_secondary10) } } diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java index ce7a6977df92e..831a606e95b2a 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java +++ b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java @@ -476,7 +476,7 @@ public class MediaControlPanel { appIconView.clearColorFilter(); if (data.getAppIcon() != null && !data.getResumption()) { appIconView.setImageIcon(data.getAppIcon()); - int color = mContext.getColor(android.R.color.system_accent2_900); + int color = mContext.getColor(R.color.material_dynamic_secondary10); appIconView.setColorFilter(color); } else { // Resume players use launcher icon @@ -590,7 +590,7 @@ public class MediaControlPanel { } else { appIconView.setImageResource(R.drawable.ic_music_note); } - int color = mContext.getColor(android.R.color.system_accent2_900); + int color = mContext.getColor(R.color.material_dynamic_secondary10); appIconView.setColorFilter(color); } diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt index e1ff110f8d735..1d1a230e8c7ae 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt @@ -150,7 +150,7 @@ class MediaDataManager( private val themeText = com.android.settingslib.Utils.getColorAttr(context, com.android.internal.R.attr.textColorPrimary).defaultColor - private val bgColor = context.getColor(android.R.color.system_accent2_50) + private val bgColor = context.getColor(R.color.material_dynamic_secondary95) // Internal listeners are part of the internal pipeline. External listeners (those registered // with [MediaDeviceManager.addListener]) receive events after they have propagated through diff --git a/packages/SystemUI/src/com/android/systemui/wallet/ui/DotIndicatorDecoration.java b/packages/SystemUI/src/com/android/systemui/wallet/ui/DotIndicatorDecoration.java index 5e9bae98a17e7..d2142dcfb2b4a 100644 --- a/packages/SystemUI/src/com/android/systemui/wallet/ui/DotIndicatorDecoration.java +++ b/packages/SystemUI/src/com/android/systemui/wallet/ui/DotIndicatorDecoration.java @@ -48,8 +48,8 @@ final class DotIndicatorDecoration extends RecyclerView.ItemDecoration { R.dimen.card_carousel_dot_selected_radius); mDotMargin = context.getResources().getDimensionPixelSize(R.dimen.card_carousel_dot_margin); - mUnselectedColor = context.getColor(com.android.internal.R.color.system_neutral1_300); - mSelectedColor = context.getColor(com.android.internal.R.color.system_neutral1_0); + mUnselectedColor = context.getColor(R.color.material_dynamic_neutral70); + mSelectedColor = context.getColor(R.color.material_dynamic_neutral100); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/wallet/ui/WalletActivity.java b/packages/SystemUI/src/com/android/systemui/wallet/ui/WalletActivity.java index 99177778310dd..92e7f2d7c76bf 100644 --- a/packages/SystemUI/src/com/android/systemui/wallet/ui/WalletActivity.java +++ b/packages/SystemUI/src/com/android/systemui/wallet/ui/WalletActivity.java @@ -278,7 +278,7 @@ public class WalletActivity extends LifecycleActivity implements private Drawable getHomeIndicatorDrawable() { Drawable drawable = getDrawable(R.drawable.ic_close); - drawable.setTint(getColor(com.android.internal.R.color.system_neutral1_300)); + drawable.setTint(getColor(R.color.material_dynamic_neutral70)); return drawable; } }