diff options
| author | Setup Wizard Team <android-setup-team-eng@google.com> | 2021-08-16 09:55:59 +0800 |
|---|---|---|
| committer | Cn Chen <cnchen@google.com> | 2021-08-18 02:25:00 +0000 |
| commit | c01734e019d00b784cce0f57a3734f900306c03a (patch) | |
| tree | 75e62cd94dd9192af214c2e4b935b3bb656c001a | |
| parent | 51e6ea6654ab88aae7c6ef9767ffb320cc8c027a (diff) | |
| download | setupcompat-c01734e019d00b784cce0f57a3734f900306c03a.tar.gz | |
Import updated Android SetupCompat Library 390949856
Copied from google3/third_party/java_src/android_libs/setupcompat
Test: mm
Included changes:
- 390949856 Fix link span not apply partner config
Bug: 193190824
PiperOrigin-RevId: 390949856
Change-Id: I31cf922ea26b2b9f172cb0f54c53ede7edf44767
| -rw-r--r-- | partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java | 4 | ||||
| -rw-r--r-- | partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java index 0e3c6a3..54a2ef8 100644 --- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java +++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfig.java @@ -227,6 +227,10 @@ public enum PartnerConfig { // Font family of the description CONFIG_DESCRIPTION_FONT_FAMILY(PartnerConfigKey.KEY_DESCRIPTION_FONT_FAMILY, ResourceType.STRING), + // Font family of the link text + CONFIG_DESCRIPTION_LINK_FONT_FAMILY( + PartnerConfigKey.KEY_DESCRIPTION_LINK_FONT_FAMILY, ResourceType.STRING), + // Margin top of the description text CONFIG_DESCRIPTION_TEXT_MARGIN_TOP( PartnerConfigKey.KEY_DESCRIPTION_TEXT_MARGIN_TOP, ResourceType.DIMENSION), diff --git a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java index 3020eea..bbededa 100644 --- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java +++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigKey.java @@ -80,6 +80,7 @@ import java.lang.annotation.RetentionPolicy; PartnerConfigKey.KEY_DESCRIPTION_TEXT_COLOR, PartnerConfigKey.KEY_DESCRIPTION_LINK_TEXT_COLOR, PartnerConfigKey.KEY_DESCRIPTION_FONT_FAMILY, + PartnerConfigKey.KEY_DESCRIPTION_LINK_FONT_FAMILY, PartnerConfigKey.KEY_DESCRIPTION_TEXT_MARGIN_TOP, PartnerConfigKey.KEY_DESCRIPTION_TEXT_MARGIN_BOTTOM, PartnerConfigKey.KEY_CONTENT_TEXT_SIZE, @@ -313,6 +314,9 @@ public @interface PartnerConfigKey { // Font family of the description String KEY_DESCRIPTION_FONT_FAMILY = "setup_design_description_font_family"; + // Font family of the link text + String KEY_DESCRIPTION_LINK_FONT_FAMILY = "setup_design_description_link_font_family"; + // Margin top of the header text String KEY_DESCRIPTION_TEXT_MARGIN_TOP = "setup_design_description_text_margin_top"; |