From 1dad5f65d4c54952a3a63efa4b9fd81b9c46d4a2 Mon Sep 17 00:00:00 2001 From: Material Design Team Date: Thu, 28 Apr 2022 14:55:01 -0400 Subject: [PATCH] [M3][Color] Add kyocera to dynamic colors allowlist and reorganized based on alphabetical order. PiperOrigin-RevId: 445211233 (cherry picked from commit 66990a1da18fcf490f3de2c816af9f2298b9c350) --- .../android/material/color/DynamicColors.java | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/lib/java/com/google/android/material/color/DynamicColors.java b/lib/java/com/google/android/material/color/DynamicColors.java index eadfad99f81..ca09efeaa90 100644 --- a/lib/java/com/google/android/material/color/DynamicColors.java +++ b/lib/java/com/google/android/material/color/DynamicColors.java @@ -74,27 +74,28 @@ public boolean isSupported() { static { Map deviceMap = new HashMap<>(); - deviceMap.put("oppo", DEFAULT_DEVICE_SUPPORT_CONDITION); - deviceMap.put("realme", DEFAULT_DEVICE_SUPPORT_CONDITION); - deviceMap.put("oneplus", DEFAULT_DEVICE_SUPPORT_CONDITION); - deviceMap.put("vivo", DEFAULT_DEVICE_SUPPORT_CONDITION); - deviceMap.put("xiaomi", DEFAULT_DEVICE_SUPPORT_CONDITION); - deviceMap.put("motorola", DEFAULT_DEVICE_SUPPORT_CONDITION); - deviceMap.put("nothing", DEFAULT_DEVICE_SUPPORT_CONDITION); - deviceMap.put("itel", DEFAULT_DEVICE_SUPPORT_CONDITION); - deviceMap.put("tecno", DEFAULT_DEVICE_SUPPORT_CONDITION); - deviceMap.put("tecno mobile limited", DEFAULT_DEVICE_SUPPORT_CONDITION); + deviceMap.put("google", DEFAULT_DEVICE_SUPPORT_CONDITION); + deviceMap.put("hmd global", DEFAULT_DEVICE_SUPPORT_CONDITION); deviceMap.put("infinix", DEFAULT_DEVICE_SUPPORT_CONDITION); deviceMap.put("infinix mobility limited", DEFAULT_DEVICE_SUPPORT_CONDITION); - deviceMap.put("hmd global", DEFAULT_DEVICE_SUPPORT_CONDITION); - deviceMap.put("sharp", DEFAULT_DEVICE_SUPPORT_CONDITION); - deviceMap.put("sony", DEFAULT_DEVICE_SUPPORT_CONDITION); - deviceMap.put("tcl", DEFAULT_DEVICE_SUPPORT_CONDITION); + deviceMap.put("itel", DEFAULT_DEVICE_SUPPORT_CONDITION); + deviceMap.put("kyocera", DEFAULT_DEVICE_SUPPORT_CONDITION); deviceMap.put("lenovo", DEFAULT_DEVICE_SUPPORT_CONDITION); deviceMap.put("lge", DEFAULT_DEVICE_SUPPORT_CONDITION); - deviceMap.put("google", DEFAULT_DEVICE_SUPPORT_CONDITION); + deviceMap.put("motorola", DEFAULT_DEVICE_SUPPORT_CONDITION); + deviceMap.put("nothing", DEFAULT_DEVICE_SUPPORT_CONDITION); + deviceMap.put("oneplus", DEFAULT_DEVICE_SUPPORT_CONDITION); + deviceMap.put("oppo", DEFAULT_DEVICE_SUPPORT_CONDITION); + deviceMap.put("realme", DEFAULT_DEVICE_SUPPORT_CONDITION); deviceMap.put("robolectric", DEFAULT_DEVICE_SUPPORT_CONDITION); deviceMap.put("samsung", SAMSUNG_DEVICE_SUPPORT_CONDITION); + deviceMap.put("sharp", DEFAULT_DEVICE_SUPPORT_CONDITION); + deviceMap.put("sony", DEFAULT_DEVICE_SUPPORT_CONDITION); + deviceMap.put("tcl", DEFAULT_DEVICE_SUPPORT_CONDITION); + deviceMap.put("tecno", DEFAULT_DEVICE_SUPPORT_CONDITION); + deviceMap.put("tecno mobile limited", DEFAULT_DEVICE_SUPPORT_CONDITION); + deviceMap.put("vivo", DEFAULT_DEVICE_SUPPORT_CONDITION); + deviceMap.put("xiaomi", DEFAULT_DEVICE_SUPPORT_CONDITION); DYNAMIC_COLOR_SUPPORTED_MANUFACTURERS = Collections.unmodifiableMap(deviceMap); }