Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Irfan Sheriff
2012-09-18 22:34:34 -07:00
committed by Android (Google) Code Review
parent 5d8d169bbb 7f0aaac7f2
commit 5d4206a55c
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/CaptivePortalTracker.java
View File

@@ -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();

9
core/res/res/values/strings.xml
View File

@@ -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>

4
core/res/res/values/symbols.xml
View File

@@ -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" />