PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename to SettingsDropdownBox" into main

Browse Source
This commit is contained in:
Chaohui Wang
2024-02-23 03:39:46 +00:00
committed by Android (Google) Code Review
parent 29b8f505fc d86cf5e4ca
commit b3646a4957
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/network/apn/ApnEditPageProvider.kt
View File

@@ -41,7 +41,7 @@ import com.android.settings.R
import com.android.settingslib.spa.framework.common.SettingsPageProvider import com.android.settingslib.spa.framework.common.SettingsPageProvider
import com.android.settingslib.spa.framework.compose.LocalNavController import com.android.settingslib.spa.framework.compose.LocalNavController
import com.android.settingslib.spa.framework.theme.SettingsDimension import com.android.settingslib.spa.framework.theme.SettingsDimension
import com.android.settingslib.spa.widget.editor.SettingsExposedDropdownMenuBox import com.android.settingslib.spa.widget.editor.SettingsDropdownBox
import com.android.settingslib.spa.widget.editor.SettingsOutlinedTextField import com.android.settingslib.spa.widget.editor.SettingsOutlinedTextField
import com.android.settingslib.spa.widget.editor.SettingsTextFieldPassword import com.android.settingslib.spa.widget.editor.SettingsTextFieldPassword
import com.android.settingslib.spa.widget.preference.SwitchPreference import com.android.settingslib.spa.widget.preference.SwitchPreference
@@ -199,19 +199,19 @@ fun ApnPage(apnDataInit: ApnData, apnDataCur: MutableState<ApnData>, uriInit: Ur
enabled = apnData.mmsPortEnabled enabled = apnData.mmsPortEnabled
) { apnData = apnData.copy(mmsPort = it) } ) { apnData = apnData.copy(mmsPort = it) }
} }
SettingsExposedDropdownMenuBox( SettingsDropdownBox(
label = stringResource(R.string.apn_auth_type), label = stringResource(R.string.apn_auth_type),
options = authTypeOptions, options = authTypeOptions,
selectedOptionIndex = apnData.authType, selectedOptionIndex = apnData.authType,
enabled = apnData.authTypeEnabled, enabled = apnData.authTypeEnabled,
) { apnData = apnData.copy(authType = it) } ) { apnData = apnData.copy(authType = it) }
SettingsExposedDropdownMenuBox( SettingsDropdownBox(
label = stringResource(R.string.apn_protocol), label = stringResource(R.string.apn_protocol),
options = apnProtocolOptions, options = apnProtocolOptions,
selectedOptionIndex = apnData.apnProtocol, selectedOptionIndex = apnData.apnProtocol,
enabled = apnData.apnProtocolEnabled enabled = apnData.apnProtocolEnabled
) { apnData = apnData.copy(apnProtocol = it) } ) { apnData = apnData.copy(apnProtocol = it) }
SettingsExposedDropdownMenuBox( SettingsDropdownBox(
label = stringResource(R.string.apn_roaming_protocol), label = stringResource(R.string.apn_roaming_protocol),
options = apnProtocolOptions, options = apnProtocolOptions,
selectedOptionIndex = apnData.apnRoaming, selectedOptionIndex = apnData.apnRoaming,