Adjusting the apn action items
Test: Visual Test
Fix: 320617647
Change-Id: If3fddab5b45140b2c66a3487c08b421a1bd3b78a
diff --git a/src/com/android/settings/network/apn/ApnEditPageProvider.kt b/src/com/android/settings/network/apn/ApnEditPageProvider.kt
index 5c7d7a4..924e311 100644
--- a/src/com/android/settings/network/apn/ApnEditPageProvider.kt
+++ b/src/com/android/settings/network/apn/ApnEditPageProvider.kt
@@ -21,10 +21,8 @@
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.Done
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
+import androidx.compose.material3.Button
+import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@@ -49,10 +47,9 @@
import com.android.settingslib.spa.widget.editor.SettingsExposedDropdownMenuCheckBox
import com.android.settingslib.spa.widget.editor.SettingsOutlinedTextField
import com.android.settingslib.spa.widget.editor.SettingsTextFieldPassword
-import com.android.settingslib.spa.widget.preference.Preference
-import com.android.settingslib.spa.widget.preference.PreferenceModel
import com.android.settingslib.spa.widget.preference.SwitchPreference
import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
+import com.android.settingslib.spa.widget.scaffold.MoreOptionsAction
import com.android.settingslib.spa.widget.scaffold.RegularScaffold
import java.util.Base64
@@ -109,7 +106,7 @@
title = if (apnDataInit.newApn) stringResource(id = R.string.apn_add) else stringResource(id = R.string.apn_edit),
actions = {
if (!apnData.customizedConfig.readOnlyApn) {
- IconButton(onClick = {
+ Button(onClick = {
apnData = apnData.copy(
networkType = ApnNetworkTypes.getNetworkType(
networkTypeSelectedOptionsState
@@ -123,7 +120,19 @@
)
if (valid == null) navController.navigateBack()
else if (!apnData.validEnabled) apnData = apnData.copy(validEnabled = true)
- }) { Icon(imageVector = Icons.Outlined.Done, contentDescription = null) }
+ }) { Text(text = stringResource(id = R.string.save)) }
+ }
+ if (!apnData.newApn && !apnData.customizedConfig.readOnlyApn
+ && apnData.customizedConfig.isAddApnAllowed
+ ) {
+ MoreOptionsAction {
+ DropdownMenuItem(
+ text = { Text(stringResource(R.string.menu_delete)) },
+ onClick = {
+ deleteApn(uriInit, context)
+ navController.navigateBack()
+ })
+ }
}
},
) {
@@ -242,19 +251,6 @@
emptyVal = stringResource(R.string.network_type_unspecified),
enabled = apnData.networkTypeEnabled
) {}
- if (!apnData.newApn && !apnData.customizedConfig.readOnlyApn
- && apnData.customizedConfig.isAddApnAllowed
- ) {
- Preference(
- object : PreferenceModel {
- override val title = stringResource(R.string.menu_delete)
- override val onClick = {
- deleteApn(uriInit, context)
- navController.navigateBack()
- }
- }
- )
- }
}
}
}
\ No newline at end of file