PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 4519870 from ce3633be80 to pi-release

Browse Source 
Change-Id: Ibbbadba65fd4d83becc6e094756d8f046907238e
This commit is contained in:
android-build-team Robot
2017-12-28 08:25:11 +00:00
parent 85c2103419 ce3633be80
commit 4ea8e7ddb1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -1951,7 +1951,7 @@
<!-- Message in dialog when the user tries to connect to a carrier network[CHAR_LIMIT=40] -->
<string name="wifi_carrier_connect">Carrier Wi\u2011Fi network</string>
<!-- Message in dialog when the user tries to connect to a carrier network[CHAR_LIMIT=60] -->
<string name="wifi_carrier_content">Connect via <xliff:g id="name">%1%s</xliff:g></string>
<string name="wifi_carrier_content">Connect via <xliff:g id="name">%1$s</xliff:g></string>
<string name="wifi_scan_always_turnon_message">To improve location accuracy and for other purposes, <xliff:g id="app_name">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?</string>
<!-- Message informing the user how to turn off [CHAR LIMIT=200] -->

2
src/com/android/settings/dashboard/SummaryLoader.java
View File

@@ -306,7 +306,7 @@ public class SummaryLoader {
makeProviderW(tile);
break;
case MSG_SET_LISTENING:
boolean listening = msg.arg1 != 0;
boolean listening = msg.obj != null && msg.obj.equals(1);
setListeningW(listening);
break;
}