diff options
author | Setup Wizard Team <android-setup-team-eng@google.com> | 2021-06-09 14:15:41 +0800 |
---|---|---|
committer | Alex Li <alexylli@google.com> | 2021-06-10 08:36:19 +0000 |
commit | 26e5d52bfea77f4f74f123f3409d513334ea23c3 (patch) | |
tree | b38e89b258e58949fd24929016ae11ee105c8b84 /main/src/com/google/android/setupdesign/template/IconMixin.java | |
parent | a8dcfe7e54601f6c3e2870db3cbbcb5879fa831c (diff) | |
download | setupdesign-26e5d52bfea77f4f74f123f3409d513334ea23c3.tar.gz |
Import updated Android Setupdesign Library 378330318
Copied from google3/third_party/java_src/android_libs/setupdesign
Test: mm
Bug: 190562325
Included changes:
- 378330318 [DynamicColor] Changes disable text color to google gray ...
- 378131441 [BC] Do not show the "More" button if there is only 1-pag...
- 378117159 [SetupWizard] Fixes the radius was lost for datetime dial...
- 377856359 [SetupDesign] Fix the Icon size did not apply
- 377838411 Consolidate log tag of setupdesign and setupcompat library
- 377507895 [SetupDesign] Fix the icon always apply partner resource ...
- 377435955 Fix DateTime dialog color
PiperOrigin-RevId: 378330318
Change-Id: I0145292dfa064c1f79e867cc16458107c64eecf5
Diffstat (limited to 'main/src/com/google/android/setupdesign/template/IconMixin.java')
-rw-r--r-- | main/src/com/google/android/setupdesign/template/IconMixin.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/main/src/com/google/android/setupdesign/template/IconMixin.java b/main/src/com/google/android/setupdesign/template/IconMixin.java index 1b2fbbf..75e624a 100644 --- a/main/src/com/google/android/setupdesign/template/IconMixin.java +++ b/main/src/com/google/android/setupdesign/template/IconMixin.java @@ -33,6 +33,7 @@ import com.google.android.setupcompat.internal.TemplateLayout; import com.google.android.setupcompat.template.Mixin; import com.google.android.setupdesign.R; import com.google.android.setupdesign.util.HeaderAreaStyler; +import com.google.android.setupdesign.util.PartnerStyleHelper; /** * A {@link com.google.android.setupcompat.template.Mixin} for setting an icon on the template @@ -91,7 +92,13 @@ public class IconMixin implements Mixin { /** Tries to apply the partner customization to the header icon. */ public void tryApplyPartnerCustomizationStyle() { - HeaderAreaStyler.applyPartnerCustomizationIconStyle(getView(), getContainerView()); + if (PartnerStyleHelper.isPartnerHeavyThemeLayout(templateLayout)) { + // apply partner heavy configs + HeaderAreaStyler.applyPartnerCustomizationIconStyle(getView(), getContainerView()); + } else if (PartnerStyleHelper.isPartnerLightThemeLayout(templateLayout)) { + // apply partner light configs + HeaderAreaStyler.applyPartnerCustomizationIconStyle(getView()); + } } /** |