Import updated Android Setupdesign Library 399844407

Copied from google3/third_party/java_src/android_libs/setupdesign

Test: mm
Bug: 200248171

Included changes:
  - 399844407 Automated g4 rollback of changelist 397224761.
  - 399844364 Automated g4 rollback of changelist 398671729.
  - 399827862 Update the content top margin for GlifPreferenceLayout la...
  - 398671729 Fix oobe e2e test failed because SUW crash when ProgressA...

PiperOrigin-RevId: 399844407
Change-Id: I5390417177bb81b0a95522317defc5bc4ec8967f

1 files changed, 6 insertions, 2 deletions

diff --git a/main/src/com/google/android/setupdesign/GlifLayout.java b/main/src/com/google/android/setupdesign/GlifLayout.java
index ee62bee..947cb13 100644
--- a/main/src/com/google/android/setupdesign/GlifLayout.java
+++ b/main/src/com/google/android/setupdesign/GlifLayout.java
@@ -137,7 +137,6 @@ public class GlifLayout extends PartnerCustomizationLayout {
     if (primaryColor != null) {
       setPrimaryColor(primaryColor);
     }
-
     if (applyPartnerHeavyThemeResource) {
       updateContentBackgroundColorWithPartnerConfig();
 
@@ -151,7 +150,12 @@ public class GlifLayout extends PartnerCustomizationLayout {
         // the value of partner config.
         LayoutStyler.applyPartnerCustomizationExtraPaddingStyle(view);
 
-        applyPartnerCustomizationContentPaddingTopStyle(view);
+        // {@class GlifPreferenceLayout} Inherited from {@class GlifRecyclerLayout}. The API would
+        // be called twice from GlifRecyclerLayout and GlifLayout, so it should skip the API here
+        // when the instance is GlifPreferenceLayout.
+        if (!(this instanceof GlifPreferenceLayout)) {
+          applyPartnerCustomizationContentPaddingTopStyle(view);
+        }
       }
     }
     updateLandscapeMiddleHorizontalSpacing();