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

Commit 5d4206a5 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android (Google) Code Review
Browse files

Merge "Get strings in" into jb-mr1-dev

parents 5d8d169b 7f0aaac7

core/java/android/net/CaptivePortalTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ public class CaptivePortalTracker { 


        if (visible) {

            CharSequence title = r.getString(R.string.wifi_available_sign_in, 0);

            CharSequence details = r.getString(R.string.wifi_available_sign_in_detailed,

            CharSequence details = r.getString(R.string.network_available_sign_in_detailed,

                    mNetworkInfo.getExtraInfo());



            Notification notification = new Notification();

core/res/res/values/strings.xml

+7 −2
Original line number Diff line number Diff line
@@ -3048,11 +3048,14 @@ 
        <item quantity="other">Open Wi-Fi networks available</item>

    </plurals>



    <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->

    <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->

    <string name="wifi_available_sign_in">Sign into Wi-Fi network</string>



    <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->

    <string name="network_available_sign_in">Sign into network</string>



    <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->

    <string name="wifi_available_sign_in_detailed"><xliff:g id="wifi_network_ssid">%1$s</xliff:g></string>

    <string name="network_available_sign_in_detailed"><xliff:g id="network_ssid">%1$s</xliff:g></string>



     <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->

     <string name="wifi_watchdog_network_disabled">Couldn\'t connect to Wi-Fi</string>
@@ -3078,6 +3081,8 @@ 
    <string name="wifi_p2p_enter_pin_message">Type the required PIN: </string>

    <string name="wifi_p2p_show_pin_message">PIN: </string>



    <string name="wifi_p2p_frequency_conflict_message">The phone will temporarily disconnect from Wi-Fi while it\'s connected to <xliff:g id="device_name">%1$s</xliff:g></string>



    <!-- Name of the dialog that lets the user choose an accented character to insert -->

    <string name="select_character">Insert character</string>

core/res/res/values/symbols.xml

+3 −1
Original line number Diff line number Diff line
@@ -791,7 +791,8 @@ 
  <java-symbol type="string" name="webpage_unresponsive" />

  <java-symbol type="string" name="whichApplication" />

  <java-symbol type="string" name="wifi_available_sign_in" />

  <java-symbol type="string" name="wifi_available_sign_in_detailed" />

  <java-symbol type="string" name="network_available_sign_in" />

  <java-symbol type="string" name="network_available_sign_in_detailed" />

  <java-symbol type="string" name="wifi_p2p_dialog_title" />

  <java-symbol type="string" name="wifi_p2p_enabled_notification_message" />

  <java-symbol type="string" name="wifi_p2p_enabled_notification_title" />
@@ -802,6 +803,7 @@ 
  <java-symbol type="string" name="wifi_p2p_show_pin_message" />

  <java-symbol type="string" name="wifi_p2p_to_message" />

  <java-symbol type="string" name="wifi_p2p_turnon_message" />

  <java-symbol type="string" name="wifi_p2p_frequency_conflict_message" />

  <java-symbol type="string" name="wifi_tether_configure_ssid_default" />

  <java-symbol type="string" name="wifi_watchdog_network_disabled" />

  <java-symbol type="string" name="wifi_watchdog_network_disabled_detailed" />