diff options
| author | Setup Wizard Team <android-setup-team-eng@google.com> | 2023-03-21 15:35:34 +0800 |
|---|---|---|
| committer | Hank Sheng <hanksheng@google.com> | 2023-03-22 06:45:44 +0000 |
| commit | 751a4aa9951ae7c3e3af7d91814b4e704b277d4f (patch) | |
| tree | 3b082b212c713a9325c854beb6ec86e74f7f9323 | |
| parent | f3721dabf7e5e8353bbdccdfe407e57db3dee3d4 (diff) | |
| download | setupdesign-751a4aa9951ae7c3e3af7d91814b4e704b277d4f.tar.gz | |
Import updated Android Setupdesign Library 518193660android14-dev
Copied from google3/third_party/java_src/android_libs/setupdesign
Test: mm
Included changes:
- 518193660 Create the new dynamic color mapping int library for load...
Bug: 244129274
PiperOrigin-RevId: 518193660
Change-Id: I112cd766db2546056d692adda918239900be64f6
| -rw-r--r-- | main/res/values-v31/colors.xml | 16 | ||||
| -rw-r--r-- | main/res/values/colors.xml | 16 |
2 files changed, 30 insertions, 2 deletions
diff --git a/main/res/values-v31/colors.xml b/main/res/values-v31/colors.xml index 1ed67df..12b13eb 100644 --- a/main/res/values-v31/colors.xml +++ b/main/res/values-v31/colors.xml @@ -15,7 +15,8 @@ limitations under the License. --> -<resources> +<resources xmlns:tools="http://schemas.android.com/tools" + tools:keep="@color/sud_system_accent*,@color/sud_system_neutral*"> <!-- Default color for BC --> <color name="sud_color_accent_glif_v3_dark">#ff669df6</color> @@ -46,6 +47,19 @@ <color name="sud_system_accent2_100">@android:color/system_accent2_100</color> + <color name="sud_system_accent2_200">@android:color/system_accent2_200</color> + + <color name="sud_system_accent2_600">@android:color/system_accent2_600</color> + + + + <color name="sud_system_accent3_100">@android:color/system_accent3_100</color> + + <color name="sud_system_accent3_200">@android:color/system_accent3_200</color> + + <color name="sud_system_accent3_600">@android:color/system_accent3_600</color> + + <color name="sud_system_neutral1_0">@android:color/system_neutral1_0</color> diff --git a/main/res/values/colors.xml b/main/res/values/colors.xml index 75fd097..5cbcf07 100644 --- a/main/res/values/colors.xml +++ b/main/res/values/colors.xml @@ -15,7 +15,8 @@ limitations under the License. --> -<resources> +<resources xmlns:tools="http://schemas.android.com/tools" + tools:keep="@color/sud_system_accent*,@color/sud_system_neutral*"> <!-- General colors --> <color name="sud_color_accent_dark">#ff448aff</color> @@ -81,6 +82,19 @@ <color name="sud_system_accent2_100">#FFE8DEF8</color> + <color name="sud_system_accent2_200">#A4CFC7</color> + + <color name="sud_system_accent2_600">#3D665F</color> + + + + <color name="sud_system_accent3_100">#ECDBFF</color> + + <color name="sud_system_accent3_200">#CFBFEB</color> + + <color name="sud_system_accent3_600">#64587F</color> + + <color name="sud_system_neutral1_0">#ffffff</color> |