diff options
| author | Setup Wizard Team <android-setup-team-eng@google.com> | 2021-06-10 15:49:36 +0800 |
|---|---|---|
| committer | Alex Li <alexylli@google.com> | 2021-06-10 08:07:24 +0000 |
| commit | f513dd2bf857ffe9da64b7f13f182ad0ad107267 (patch) | |
| tree | 2dd2b648ac21225fb7f2fa654ea5d04b69cc29b1 /main/res | |
| parent | ab6e0fff53c29f4ededb53a69839c79f29f3bbab (diff) | |
| download | setupcompat-f513dd2bf857ffe9da64b7f13f182ad0ad107267.tar.gz | |
Import updated Android SetupCompat Library 378593677
Copied from google3/third_party/java_src/android_libs/setupcompat
Test: mm
Bug: 190562325
Included changes:
- 378593677 [SetupDesign] Dynamic primary button - fix the primary bu...
- 378572218 Rollback P100 color
- 378372241 Add missed log in setupcompat
- 378097631 [DynamicColor] Moves the function that apply dynamic colo...
- 377838411 Consolidate log tag of setupdesign and setupcompat library
- 377415349 Apply dynamic color P100 on a primary-style secondary but...
PiperOrigin-RevId: 378593677
Change-Id: I7384eaccb01cb95199ad281abb476e5c7c2f4ca4
Diffstat (limited to 'main/res')
| -rw-r--r-- | main/res/values-v31/colors.xml | 21 | ||||
| -rw-r--r-- | main/res/values/colors.xml | 3 |
2 files changed, 0 insertions, 24 deletions
diff --git a/main/res/values-v31/colors.xml b/main/res/values-v31/colors.xml deleted file mode 100644 index da7f1e8..0000000 --- a/main/res/values-v31/colors.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2021 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<resources> - <color name="suc_system_accent1_100">@android:color/system_accent1_100</color> - <color name="suc_system_neutral1_900">@android:color/system_neutral1_900</color> -</resources>
\ No newline at end of file diff --git a/main/res/values/colors.xml b/main/res/values/colors.xml index e9f25a5..f472b35 100644 --- a/main/res/values/colors.xml +++ b/main/res/values/colors.xml @@ -23,7 +23,4 @@ <color name="suc_customization_button_highlight_default">#ff1a73e8</color> - <color name="suc_system_accent1_100">#8DF5E3</color> - - <color name="suc_system_neutral1_900">#1b1b1b</color> </resources>
\ No newline at end of file |