From 186fe7ccceb6f64d8e7b2daf09dbb46040da72ef Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Fri, 21 Mar 2025 03:38:23 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Ia9ea2bce71ac2289c26fb57f9efa8f8d92e11e7c --- res/values-iw/strings.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index c3c3aff29..e4beae2ac 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -315,6 +315,5 @@ "הצגה בתצוגת טבלה." "הצגה בתצוגת רשימה." "•" - - + "שם הקובץ" -- cgit v1.2.3-59-g8ed1b From 8df10b7cb0b244fd0dea247a4fd1cd2266b7ff14 Mon Sep 17 00:00:00 2001 From: Wenbo Jie Date: Sun, 23 Mar 2025 23:38:37 +0000 Subject: [DocsUI M3] Fix "failed to resolve attribute" crash on SDK 30 On SDK 30 and also some other devices, DocsUI crashes when it's open because it can't resolve "@color/primary" resource, whose value points to a material color attribute. To fix it, this CL stops using the color attribute as the value: * It uses a static color for SDK 30 (this static color is from the same color attribute when dynamic color is OFF). * It uses the mapped system tokens from the color attribute for SDK 31+. Check the attached bug for the demo. Bug: 398973028 Test: m DocumentsUIGoogle && manual inspection Flag: com.android.documentsui.flags.use_material3 Change-Id: I139d623f3c36f63abef9e7421c38691dfc50265f --- .../values-night-v31/colors.xml | 2 ++ .../values-night/colors.xml | 2 ++ .../values-v31/colors.xml | 2 ++ .../values/colors.xml | 3 ++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/res/flag(com.android.documentsui.flags.use_material3)/values-night-v31/colors.xml b/res/flag(com.android.documentsui.flags.use_material3)/values-night-v31/colors.xml index b75afa868..72dd819bb 100644 --- a/res/flag(com.android.documentsui.flags.use_material3)/values-night-v31/colors.xml +++ b/res/flag(com.android.documentsui.flags.use_material3)/values-night-v31/colors.xml @@ -14,6 +14,8 @@ --> + + @android:color/system_accent1_200 @*android:color/system_accent1_200 diff --git a/res/flag(com.android.documentsui.flags.use_material3)/values-night/colors.xml b/res/flag(com.android.documentsui.flags.use_material3)/values-night/colors.xml index ef4f5a902..b3cd1dae3 100644 --- a/res/flag(com.android.documentsui.flags.use_material3)/values-night/colors.xml +++ b/res/flag(com.android.documentsui.flags.use_material3)/values-night/colors.xml @@ -18,6 +18,8 @@ #3C4043 #52000000 + + #D0BCFF #3D8AB4F8 #5F6368 diff --git a/res/flag(com.android.documentsui.flags.use_material3)/values-v31/colors.xml b/res/flag(com.android.documentsui.flags.use_material3)/values-v31/colors.xml index b7e11e885..27b636fe1 100644 --- a/res/flag(com.android.documentsui.flags.use_material3)/values-v31/colors.xml +++ b/res/flag(com.android.documentsui.flags.use_material3)/values-v31/colors.xml @@ -14,6 +14,8 @@ --> + + @android:color/system_accent1_600 @*android:color/system_accent1_600 diff --git a/res/flag(com.android.documentsui.flags.use_material3)/values/colors.xml b/res/flag(com.android.documentsui.flags.use_material3)/values/colors.xml index 5696288e6..fed5a018a 100644 --- a/res/flag(com.android.documentsui.flags.use_material3)/values/colors.xml +++ b/res/flag(com.android.documentsui.flags.use_material3)/values/colors.xml @@ -22,7 +22,8 @@ @android:color/white #99FFFFFF - ?attr/colorPrimary + + #6750A4 #E3F2FD #E0E0E0 -- cgit v1.2.3-59-g8ed1b