diff --git a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java index f9a1113c054..0af8aa17524 100644 --- a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java @@ -49,6 +49,8 @@ public class ToggleScreenReaderPreferenceFragmentForSetupWizard if (mTopIntroPreference != null) { mTopIntroPreference.setVisible(false); } + + mToggleServiceSwitchPreference.applyPartnerCustomizationPaddingStyle(); } @Override diff --git a/src/com/android/settings/widget/SettingsMainSwitchPreference.java b/src/com/android/settings/widget/SettingsMainSwitchPreference.java index b7c69017404..92649113d82 100644 --- a/src/com/android/settings/widget/SettingsMainSwitchPreference.java +++ b/src/com/android/settings/widget/SettingsMainSwitchPreference.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.res.TypedArray; import android.text.TextUtils; import android.util.AttributeSet; +import android.view.ViewGroup; import android.widget.Switch; import androidx.core.content.res.TypedArrayUtils; @@ -33,6 +34,8 @@ import com.android.settings.widget.SettingsMainSwitchBar.OnBeforeCheckedChangeLi import com.android.settingslib.RestrictedPreferenceHelper; import com.android.settingslib.widget.OnMainSwitchChangeListener; +import com.google.android.setupdesign.util.LayoutStyler; + import java.util.ArrayList; import java.util.List; @@ -48,6 +51,7 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements new ArrayList<>(); private final List mSwitchChangeListeners = new ArrayList<>(); + private boolean mApplyPartnerCustomizationPaddingStyle; private SettingsMainSwitchBar mMainSwitchBar; private CharSequence mTitle; private EnforcedAdmin mEnforcedAdmin; @@ -95,6 +99,12 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements } else { mMainSwitchBar.hide(); } + + if (mApplyPartnerCustomizationPaddingStyle) { + // TODO(b/232494666): Replace all margins of the root view with the padding + final ViewGroup parentView = (ViewGroup) mMainSwitchBar.getParent(); + LayoutStyler.applyPartnerCustomizationLayoutPaddingStyle(parentView); + } } private void init(Context context, AttributeSet attrs) { @@ -241,6 +251,14 @@ public class SettingsMainSwitchPreference extends TwoStatePreference implements } } + /** + * Apples the padding style of the partner's customization. It's used in the SetupWizard. + */ + public void applyPartnerCustomizationPaddingStyle() { + mApplyPartnerCustomizationPaddingStyle = true; + notifyChanged(); + } + private void initMainSwitchBar() { if (mMainSwitchBar != null) { mMainSwitchBar.setTitle(mTitle);