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

Commit 5b42e7e5 authored by Arc Wang's avatar Arc Wang
Browse files

[Wi-Fi] Update android R strings 

For these features:
1. No user certificate for WPA-Enterprise 192-bit
2. Apps to add saved networks
3. Disconnect network

Bug: 149070448
Bug: 149069854
Bug: 148281247
Test: manual visual
Change-Id: I8ad9741446c93bd75142c612c6ca67a57f2cf9e2
parent 5610db5a

res/values/strings.xml

+10 −4
Original line number Diff line number Diff line
@@ -2126,7 +2126,7 @@ 
    <!-- Warning message displayed if user does not specify a user certification for

         WPA3-Enterprise 192-bit. Only displayed if the user does not specify user certificate

         for WPA3-Enterprise 192-bit [CHAR LIMIT=80]-->

    <string name="wifi_no_user_cert_warning">This option requires a user certificate.</string>

    <string name="wifi_no_user_cert_warning">Certificate required.</string>

    <!-- Substring of status line when Wi-Fi Protected Setup (WPS) is available and

         string is listed first [CHAR LIMIT=20]-->

    <string name="wifi_wps_available_first_item">WPS available</string>
@@ -2354,17 +2354,21 @@ 
    <!-- Title for the panel of add Wi-Fi network from APP [CHAR LIMIT=50] -->

    <string name="wifi_add_app_single_network_title">Save this network?</string>

    <!-- Summary for the panel of add Wi-Fi network from APP [CHAR LIMIT=NONE] -->

    <string name="wifi_add_app_single_network_summary"><xliff:g id="appName" example="ThirdPartyAppName">%1$s</xliff:g> wants to save a network to your phone</string>

    <string name="wifi_add_app_single_network_summary" product="default"><xliff:g id="appName" example="ThirdPartyAppName">%1$s</xliff:g> wants to save a network to your phone</string>

    <!-- Summary for the panel of add Wi-Fi network from APP [CHAR LIMIT=NONE] -->

    <string name="wifi_add_app_single_network_summary" product="tablet"><xliff:g id="appName" example="ThirdPartyAppName">%1$s</xliff:g> wants to save a network to your tablet</string>

    <!-- Summary for saving status when saving single network [CHAR LIMIT=30] -->

    <string name="wifi_add_app_single_network_saving_summary">Saving\u2026</string>

    <!-- Summary for saved status when saving single network   [CHAR LIMIT=30] -->

    <string name="wifi_add_app_single_network_saved_summary">Saved</string>

    <!-- Summary for save failed status when saving single network [CHAR LIMIT=50] -->

    <string name="wifi_add_app_network_save_failed_summary">Couldn\u2019t save. Try again.</string>

    <string name="wifi_add_app_network_save_failed_summary">Can\u2019t save. Try again.</string>

    <!--  Title for the panel of add multiple Wi-Fi networks from APP [CHAR LIMIT=50] -->

    <string name="wifi_add_app_networks_title">Save networks?</string>

    <!-- Summary for the panel of add multiple Wi-Fi networks from APP [CHAR LIMIT=NONE] -->

    <string name="wifi_add_app_networks_summary"><xliff:g id="appName" example="ThirdPartyAppName">%1$s</xliff:g> wants to save these networks to your phone</string>

    <string name="wifi_add_app_networks_summary" product="default"><xliff:g id="appName" example="ThirdPartyAppName">%1$s</xliff:g> wants to save these networks to your phone</string>

    <!-- Summary for the panel of add multiple Wi-Fi networks from APP [CHAR LIMIT=NONE] -->

    <string name="wifi_add_app_networks_summary" product="tablet"><xliff:g id="appName" example="ThirdPartyAppName">%1$s</xliff:g> wants to save these networks to your tablet</string>

    <!-- Summary for the panel of add Wi-Fi networks from APP [CHAR LIMIT=NONE] -->

    <string name="wifi_add_app_networks_saving_summary">Saving <xliff:g id="number" example="3">%d</xliff:g> networks\u2026</string>

    <!-- Summary for saved status when saving multiple networks   [CHAR LIMIT=NONE] -->
@@ -2529,6 +2533,8 @@ 
    <!-- Message to display when carrier does not support wifi calling or doesn't want the user

         to modify the settings [CHAR LIMIT=NONE] -->

    <string name="wifi_calling_not_supported">Wi\u2011Fi calling is not supported for %1$s</string>

    <!-- Hint for a Wi-Fi network is disconnected successfully [CHAR LIMIT=NONE] -->

    <string name="wifi_disconnected_from">Disconnected from <xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g></string>

    <!-- Carrier string to use in other messages -->

    <string name="carrier">Carrier</string>

    <!-- Sound and alerts settings -->

src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java

+8 −1
Original line number Diff line number Diff line
@@ -904,7 +904,14 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle 
     */

    @Override

    public void onDisconnectResult(@DisconnectStatus int status) {

        if (status != DisconnectCallback.DISCONNECT_STATUS_SUCCESS) {

        if (status == DisconnectCallback.DISCONNECT_STATUS_SUCCESS) {

            final Activity activity = mFragment.getActivity();

            if (activity != null) {

                Toast.makeText(activity,

                        activity.getString(R.string.wifi_disconnected_from, mWifiEntry.getTitle()),

                        Toast.LENGTH_SHORT).show();

            }

        } else {

            Log.e(TAG, "Disconnect Wi-Fi network failed");

        }

    }