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();