Merge "Adjust padding on SIM onboarding screens" into main

src/com/android/settings/spa/network/SimOnboardingLabelSim.kt

@@ -17,12 +17,10 @@
 package com.android.settings.spa.network
 
 import android.telephony.SubscriptionInfo
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.SignalCellularAlt
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -42,7 +40,6 @@ import com.android.settingslib.spa.widget.preference.Preference
 import com.android.settingslib.spa.widget.preference.PreferenceModel
 import com.android.settingslib.spa.widget.scaffold.BottomAppBarButton
 import com.android.settingslib.spa.widget.scaffold.SuwScaffold
-import com.android.settingslib.spa.widget.ui.SettingsBody
 
 /**
  * the sim onboarding label compose
@@ -71,9 +68,7 @@ fun SimOnboardingLabelSimImpl(
 
 @Composable
 private fun LabelSimBody(onboardingService: SimOnboardingService) {
-    Column(Modifier.padding(SettingsDimension.itemPadding)) {
+    SimOnboardingMessage(stringResource(R.string.sim_onboarding_label_sim_msg))
-        SettingsBody(stringResource(R.string.sim_onboarding_label_sim_msg))
-    }
 
     for (subInfo in onboardingService.getSelectableSubscriptionInfoList()) {
         LabelSimPreference(onboardingService, subInfo)

src/com/android/settings/spa/network/SimOnboardingPageProvider.kt

@@ -16,15 +16,16 @@
 
 package com.android.settings.spa.network
 
-
 import android.app.Activity
 import android.content.Context
 import android.content.ContextWrapper
 import android.os.Bundle
-import android.util.Log
 import androidx.annotation.VisibleForTesting
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.NavHostController
 import androidx.navigation.NavType
@@ -40,8 +41,10 @@ import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
 import com.android.settingslib.spa.framework.common.SettingsPageProvider
 import com.android.settingslib.spa.framework.common.createSettingsPage
 import com.android.settingslib.spa.framework.compose.navigator
+import com.android.settingslib.spa.framework.theme.SettingsDimension
 import com.android.settingslib.spa.widget.preference.Preference
 import com.android.settingslib.spa.widget.preference.PreferenceModel
+import com.android.settingslib.spa.widget.ui.SettingsBody
 
 const val SUB_ID = "subId"
 
@@ -137,3 +140,16 @@ fun PageImpl(onboardingService:SimOnboardingService,navHostController: NavHostCo
         }
     }
 }
+
+@Composable
+fun SimOnboardingMessage(text: String) {
+    Column(
+        Modifier.padding(
+            start = SettingsDimension.itemPaddingStart,
+            end = SettingsDimension.itemPaddingEnd,
+            bottom = SettingsDimension.paddingExtraLarge,
+        )
+    ) {
+        SettingsBody(text)
+    }
+}

src/com/android/settings/spa/network/SimOnboardingPrimarySim.kt

@@ -17,8 +17,6 @@
 package com.android.settings.spa.network
 
 import android.telephony.SubscriptionManager
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.SignalCellularAlt
 import androidx.compose.runtime.Composable
@@ -27,20 +25,17 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.android.settings.R
 import com.android.settings.network.SimOnboardingService
-import com.android.settingslib.spa.framework.theme.SettingsDimension
 import com.android.settingslib.spa.widget.preference.ListPreference
 import com.android.settingslib.spa.widget.preference.ListPreferenceModel
 import com.android.settingslib.spa.widget.preference.ListPreferenceOption
 import com.android.settingslib.spa.widget.scaffold.BottomAppBarButton
 import com.android.settingslib.spa.widget.scaffold.SuwScaffold
-import com.android.settingslib.spa.widget.ui.SettingsBody
 import com.android.settingslib.spa.widget.ui.SettingsIcon
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.flow
@@ -77,9 +72,7 @@ fun SimOnboardingPrimarySimImpl(
             mutableIntStateOf(SubscriptionManager.INVALID_SUBSCRIPTION_ID)
         }
 
-        Column(Modifier.padding(SettingsDimension.itemPadding)) {
+        SimOnboardingMessage(stringResource(id = R.string.sim_onboarding_primary_sim_msg))
-            SettingsBody(stringResource(id = R.string.sim_onboarding_primary_sim_msg))
-        }
 
         val context = LocalContext.current
         val primarySimInfo = remember {

src/com/android/settings/spa/network/SimOnboardingSelectSim.kt

@@ -16,8 +16,6 @@
 
 package com.android.settings.spa.network
 
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.SignalCellularAlt
 import androidx.compose.runtime.Composable
@@ -25,16 +23,13 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import com.android.settings.R
 import com.android.settings.network.SimOnboardingService
-import com.android.settingslib.spa.framework.theme.SettingsDimension
 import com.android.settingslib.spa.widget.preference.CheckboxPreference
 import com.android.settingslib.spa.widget.preference.CheckboxPreferenceModel
 import com.android.settingslib.spa.widget.scaffold.BottomAppBarButton
 import com.android.settingslib.spa.widget.scaffold.SuwScaffold
-import com.android.settingslib.spa.widget.ui.SettingsBody
 
 /**
  * the sim onboarding select sim compose
@@ -69,9 +64,8 @@ private fun SelectSimBody(
     onboardingService: SimOnboardingService,
     isFinished: MutableState<Boolean>
 ) {
-    Column(Modifier.padding(SettingsDimension.itemPadding)) {
+    SimOnboardingMessage(stringResource(id = R.string.sim_onboarding_select_sim_msg))
-        SettingsBody(stringResource(id = R.string.sim_onboarding_select_sim_msg))
+
-    }
     isFinished.value = onboardingService.isSimSelectionFinished
     for (subInfo in onboardingService.getSelectableSubscriptionInfoList()) {
         var title = onboardingService.getSubscriptionInfoDisplayName(subInfo)