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

Commit c865fd9e authored by Zoey Chen's avatar Zoey Chen Committed by Automerger Merge Worker
Browse files

Merge "[Settings] Add search keywords for APN controller" into tm-qpr-dev am:... 

Merge "[Settings] Add search keywords for APN controller" into tm-qpr-dev am: e99f20df am: c76250cd

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20747651



Change-Id: I8801847eaab9dd25c140d660ac66f0c20385eb2e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4f80100 c76250cd

res/values/strings.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -10300,6 +10300,8 @@ 
    <string name="mobile_network_mode_error">Invalid Network Mode <xliff:g id="networkModeId" example="0">%1$d</xliff:g>. Ignore.</string>

    <string name="mobile_network_mode_error">Invalid Network Mode <xliff:g id="networkModeId" example="0">%1$d</xliff:g>. Ignore.</string>

    <!-- Title for Apn settings in mobile network settings [CHAR LIMIT=60] -->

    <!-- Title for Apn settings in mobile network settings [CHAR LIMIT=60] -->

    <string name="mobile_network_apn_title">Access Point Names</string>

    <string name="mobile_network_apn_title">Access Point Names</string>

    <!-- Search keywords for "Access Point Names" [CHAR_LIMIT=NONE] -->

    <string name="keywords_access_point_names">apn</string>

















    <!-- Available networks screen, summary when button disallowed due to permanent automatic mode [CHAR LIMIT=NONE] -->







    <!-- Available networks screen, summary when button disallowed due to permanent automatic mode [CHAR LIMIT=NONE] -->











    <string name="manual_mode_disallowed_summary">Unavailable when connected to <xliff:g id="carrier" example="verizon">%1$s</xliff:g></string>







    <string name="manual_mode_disallowed_summary">Unavailable when connected to <xliff:g id="carrier" example="verizon">%1$s</xliff:g></string>

























res/xml/mobile_network_settings.xml



+1
−0




























Original line number
Original line
Diff line number
Diff line








@@ -233,6 +233,7 @@









            android:persistent="false"







            android:persistent="false"











            android:title="@string/mobile_network_apn_title"







            android:title="@string/mobile_network_apn_title"











            settings:allowDividerAbove="true"







            settings:allowDividerAbove="true"














            settings:keywords="@string/keywords_access_point_names"











            settings:controller="com.android.settings.network.telephony.ApnPreferenceController"/>







            settings:controller="com.android.settings.network.telephony.ApnPreferenceController"/>































        <Preference







        <Preference