Add SettingsTextFieldPassword enable.
Fix: 298906796 Test: Visual Change-Id: I89754fc27fe0eec4df029c9ec0ba969b5ea85b59
This commit is contained in:
Charlotte Lu
@@ -100,87 +100,88 @@ fun ApnPage(apnDataCur: MutableState<ApnData>) {
|
|||||||
) {
|
) {
|
||||||
Column() {
|
Column() {
|
||||||
SettingsOutlinedTextField(
|
SettingsOutlinedTextField(
|
||||||
apnData.name,
|
value = apnData.name,
|
||||||
stringResource(R.string.apn_name),
|
label = stringResource(R.string.apn_name),
|
||||||
enabled = apnData.nameEnabled
|
enabled = apnData.nameEnabled
|
||||||
) { apnData = apnData.copy(name = it) }
|
) { apnData = apnData.copy(name = it) }
|
||||||
SettingsOutlinedTextField(
|
SettingsOutlinedTextField(
|
||||||
apnData.apn,
|
value = apnData.apn,
|
||||||
stringResource(R.string.apn_apn),
|
label = stringResource(R.string.apn_apn),
|
||||||
enabled = apnData.apnEnabled
|
enabled = apnData.apnEnabled
|
||||||
) { apnData = apnData.copy(apn = it) }
|
) { apnData = apnData.copy(apn = it) }
|
||||||
SettingsOutlinedTextField(
|
SettingsOutlinedTextField(
|
||||||
apnData.proxy,
|
value = apnData.proxy,
|
||||||
stringResource(R.string.apn_http_proxy),
|
label = stringResource(R.string.apn_http_proxy),
|
||||||
enabled = apnData.proxyEnabled
|
enabled = apnData.proxyEnabled
|
||||||
) { apnData = apnData.copy(proxy = it) }
|
) { apnData = apnData.copy(proxy = it) }
|
||||||
SettingsOutlinedTextField(
|
SettingsOutlinedTextField(
|
||||||
apnData.port,
|
value = apnData.port,
|
||||||
stringResource(R.string.apn_http_port),
|
label = stringResource(R.string.apn_http_port),
|
||||||
enabled = apnData.portEnabled
|
enabled = apnData.portEnabled
|
||||||
) { apnData = apnData.copy(port = it) }
|
) { apnData = apnData.copy(port = it) }
|
||||||
SettingsOutlinedTextField(
|
SettingsOutlinedTextField(
|
||||||
apnData.userName,
|
value = apnData.userName,
|
||||||
stringResource(R.string.apn_user),
|
label = stringResource(R.string.apn_user),
|
||||||
enabled = apnData.userNameEnabled
|
enabled = apnData.userNameEnabled
|
||||||
) { apnData = apnData.copy(userName = it) }
|
) { apnData = apnData.copy(userName = it) }
|
||||||
SettingsTextFieldPassword(
|
SettingsTextFieldPassword(
|
||||||
apnData.passWord,
|
value = apnData.passWord,
|
||||||
stringResource(R.string.apn_password)
|
label = stringResource(R.string.apn_password),
|
||||||
|
enabled = apnData.passWordEnabled
|
||||||
) { apnData = apnData.copy(passWord = it) }
|
) { apnData = apnData.copy(passWord = it) }
|
||||||
SettingsOutlinedTextField(
|
SettingsOutlinedTextField(
|
||||||
apnData.server,
|
value = apnData.server,
|
||||||
stringResource(R.string.apn_server),
|
label = stringResource(R.string.apn_server),
|
||||||
enabled = apnData.serverEnabled
|
enabled = apnData.serverEnabled
|
||||||
) { apnData = apnData.copy(server = it) }
|
) { apnData = apnData.copy(server = it) }
|
||||||
SettingsOutlinedTextField(
|
SettingsOutlinedTextField(
|
||||||
apnData.mmsc,
|
value = apnData.mmsc,
|
||||||
stringResource(R.string.apn_mmsc),
|
label = stringResource(R.string.apn_mmsc),
|
||||||
enabled = apnData.mmscEnabled
|
enabled = apnData.mmscEnabled
|
||||||
) { apnData = apnData.copy(mmsc = it) }
|
) { apnData = apnData.copy(mmsc = it) }
|
||||||
SettingsOutlinedTextField(
|
SettingsOutlinedTextField(
|
||||||
apnData.mmsProxy,
|
value = apnData.mmsProxy,
|
||||||
stringResource(R.string.apn_mms_proxy),
|
label = stringResource(R.string.apn_mms_proxy),
|
||||||
enabled = apnData.mmsProxyEnabled
|
enabled = apnData.mmsProxyEnabled
|
||||||
) { apnData = apnData.copy(mmsProxy = it) }
|
) { apnData = apnData.copy(mmsProxy = it) }
|
||||||
SettingsOutlinedTextField(
|
SettingsOutlinedTextField(
|
||||||
apnData.mmsPort,
|
value = apnData.mmsPort,
|
||||||
stringResource(R.string.apn_mms_port),
|
label = stringResource(R.string.apn_mms_port),
|
||||||
enabled = apnData.mmsPortEnabled
|
enabled = apnData.mmsPortEnabled
|
||||||
) { apnData = apnData.copy(mmsPort = it) }
|
) { apnData = apnData.copy(mmsPort = it) }
|
||||||
SettingsOutlinedTextField(
|
SettingsOutlinedTextField(
|
||||||
apnData.mcc,
|
value = apnData.mcc,
|
||||||
stringResource(R.string.apn_mcc),
|
label = stringResource(R.string.apn_mcc),
|
||||||
enabled = apnData.mccEnabled
|
enabled = apnData.mccEnabled
|
||||||
) { apnData = apnData.copy(mcc = it) }
|
) { apnData = apnData.copy(mcc = it) }
|
||||||
SettingsOutlinedTextField(
|
SettingsOutlinedTextField(
|
||||||
apnData.mnc,
|
value = apnData.mnc,
|
||||||
stringResource(R.string.apn_mnc),
|
label = stringResource(R.string.apn_mnc),
|
||||||
enabled = apnData.mncEnabled
|
enabled = apnData.mncEnabled
|
||||||
) { apnData = apnData.copy(mnc = it) }
|
) { apnData = apnData.copy(mnc = it) }
|
||||||
// Warning: apnProtocol, apnRoaming, mvnoType string2Int
|
// Warning: apnProtocol, apnRoaming, mvnoType string2Int
|
||||||
SettingsExposedDropdownMenuBox(
|
SettingsExposedDropdownMenuBox(
|
||||||
stringResource(R.string.apn_auth_type),
|
label = stringResource(R.string.apn_auth_type),
|
||||||
authTypeOptions,
|
options = authTypeOptions,
|
||||||
apnData.authType,
|
selectedOptionIndex = apnData.authType,
|
||||||
apnData.authTypeEnabled,
|
enabled = apnData.authTypeEnabled,
|
||||||
) { apnData = apnData.copy(authType = it) }
|
) { apnData = apnData.copy(authType = it) }
|
||||||
SettingsOutlinedTextField(
|
SettingsOutlinedTextField(
|
||||||
apnData.apnType,
|
value = apnData.apnType,
|
||||||
stringResource(R.string.apn_type),
|
label = stringResource(R.string.apn_type),
|
||||||
enabled = apnData.apnTypeEnabled
|
enabled = apnData.apnTypeEnabled
|
||||||
) { apnData = apnData.copy(apn = it) } // TODO: updateApnType
|
) { apnData = apnData.copy(apn = it) } // TODO: updateApnType
|
||||||
SettingsExposedDropdownMenuBox(
|
SettingsExposedDropdownMenuBox(
|
||||||
stringResource(R.string.apn_protocol),
|
label = stringResource(R.string.apn_protocol),
|
||||||
apnProtocolOptions,
|
options = apnProtocolOptions,
|
||||||
apnData.apnProtocol,
|
selectedOptionIndex = apnData.apnProtocol,
|
||||||
apnData.apnProtocolEnabled
|
enabled = apnData.apnProtocolEnabled
|
||||||
) { apnData = apnData.copy(apnProtocol = it) }
|
) { apnData = apnData.copy(apnProtocol = it) }
|
||||||
SettingsExposedDropdownMenuBox(
|
SettingsExposedDropdownMenuBox(
|
||||||
stringResource(R.string.apn_roaming_protocol),
|
label = stringResource(R.string.apn_roaming_protocol),
|
||||||
apnProtocolOptions,
|
options = apnProtocolOptions,
|
||||||
apnData.apnRoaming,
|
selectedOptionIndex = apnData.apnRoaming,
|
||||||
apnData.apnRoamingEnabled
|
enabled = apnData.apnRoamingEnabled
|
||||||
) { apnData = apnData.copy(apnRoaming = it) }
|
) { apnData = apnData.copy(apnRoaming = it) }
|
||||||
SwitchPreference(
|
SwitchPreference(
|
||||||
object : SwitchPreferenceModel {
|
object : SwitchPreferenceModel {
|
||||||
@@ -195,23 +196,23 @@ fun ApnPage(apnDataCur: MutableState<ApnData>) {
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
SettingsExposedDropdownMenuCheckBox(
|
SettingsExposedDropdownMenuCheckBox(
|
||||||
stringResource(R.string.bearer),
|
label = stringResource(R.string.bearer),
|
||||||
bearerOptions,
|
options = bearerOptions,
|
||||||
bearerSelectedOptionsState,
|
selectedOptionsState = bearerSelectedOptionsState,
|
||||||
bearerEmptyVal,
|
emptyVal = bearerEmptyVal,
|
||||||
apnData.bearerEnabled
|
enabled = apnData.bearerEnabled
|
||||||
) {}
|
) {}
|
||||||
SettingsExposedDropdownMenuBox(
|
SettingsExposedDropdownMenuBox(
|
||||||
stringResource(R.string.mvno_type),
|
label = stringResource(R.string.mvno_type),
|
||||||
mvnoTypeOptions,
|
options = mvnoTypeOptions,
|
||||||
apnData.mvnoType,
|
selectedOptionIndex = apnData.mvnoType,
|
||||||
apnData.mvnoTypeEnabled
|
enabled = apnData.mvnoTypeEnabled
|
||||||
) {
|
) {
|
||||||
apnData = apnData.copy(mvnoType = it)
|
apnData = apnData.copy(mvnoType = it)
|
||||||
} // TODO: mvnoDescription
|
} // TODO: mvnoDescription
|
||||||
SettingsOutlinedTextField(
|
SettingsOutlinedTextField(
|
||||||
apnData.mvnoValue,
|
value = apnData.mvnoValue,
|
||||||
stringResource(R.string.mvno_match_data),
|
label = stringResource(R.string.mvno_match_data),
|
||||||
enabled = apnData.mvnoValueEnabled
|
enabled = apnData.mvnoValueEnabled
|
||||||
) { apnData = apnData.copy(mvnoValue = it) }
|
) { apnData = apnData.copy(mvnoValue = it) }
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user