Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8630aa4 authored by Charlotte Lu's avatar Charlotte Lu Committed by Android (Google) Code Review
Browse files

Merge "Show "add access point" when the user selects add Apn." into main

parents 7b644064 8cbffebb

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -3169,6 +3169,8 @@ 
    <string name="apn_settings">APNs</string>

    <!-- Screen title after user selects APNs setting option -->

    <string name="apn_edit">Edit access point</string>

    <!-- Screen title after user selects add APNs setting -->

    <string name="apn_add">Add access point</string>

    <!-- Edit access point label summary text when no value has been set -->

    <string name="apn_not_set">Not set</string>

    <!-- Edit access point label summary text when no value has been set for mvno value. [CHAR LIMIT=NONE]-->

src/com/android/settings/network/apn/ApnEditPageProvider.kt

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ fun ApnPage(apnDataInit: ApnData, apnDataCur: MutableState<ApnData>, uriInit: Ur 
        getNetworkTypeSelectedOptionsState(apnData.networkType)

    }

    RegularScaffold(

        title = stringResource(id = R.string.apn_edit),

        title = if(apnDataInit.newApn) stringResource(id = R.string.apn_add) else stringResource(id = R.string.apn_edit),

        actions = {

            IconButton(onClick = {

                validateAndSaveApnData(