From 3cef2a0f966ff3bdc78bb8e14e3a9c8dc3aabd43 Mon Sep 17 00:00:00 2001 From: Yuchen Date: Mon, 30 Dec 2024 02:51:53 +0000 Subject: [PATCH] [Expressive design] Update MainSwitchPreference padding in SettingsActivity. Update padding programmatically to avoid regression in b/385850462. Bug: 349681531 Flag: EXEMPT migration Test: visual Change-Id: I916dd6e9a41f410ab7d71252944fbf831cd96198 --- src/com/android/settings/SettingsActivity.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index c81d504b223..6097b0682da 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -315,6 +315,12 @@ public class SettingsActivity extends SettingsBaseActivity if (mMainSwitch != null) { mMainSwitch.setMetricsCategory(lookupMetricsCategory()); mMainSwitch.setTranslationZ(findViewById(R.id.main_content).getTranslationZ() + 1); + if (SettingsThemeHelper.isExpressiveTheme(this)) { + final int paddingHorizontal = getResources().getDimensionPixelSize( + com.android.settingslib.widget.theme + .R.dimen.settingslib_expressive_space_small1); + mMainSwitch.setPadding(paddingHorizontal, 0, paddingHorizontal, 0); + } } getSupportFragmentManager().addOnBackStackChangedListener(this);