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

Merge "Update string to reflect removed users." into jb-mr1-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2012-09-19 18:58:06 -07:00
committed by Android (Google) Code Review
parent 801a1588d9 6bf72119fd
commit 99340f36cb
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -4032,6 +4032,8 @@
<!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] --> <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
<string name="data_usage_uninstalled_apps">Removed apps</string> <string name="data_usage_uninstalled_apps">Removed apps</string>
<!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
<string name="data_usage_uninstalled_apps_users">Removed apps and users</string>
<!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] --> <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
<string name="data_usage_received_sent"><xliff:g id="received" example="128KB">%1$s</xliff:g> received, <xliff:g id="sent" example="1.3GB">%2$s</xliff:g> sent</string> <string name="data_usage_received_sent"><xliff:g id="received" example="128KB">%1$s</xliff:g> received, <xliff:g id="sent" example="1.3GB">%2$s</xliff:g> sent</string>
<!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] --> <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->

4
src/com/android/settings/net/UidDetailProvider.java
View File

@@ -101,7 +101,9 @@ public class UidDetailProvider {
detail.icon = pm.getDefaultActivityIcon(); detail.icon = pm.getDefaultActivityIcon();
return detail; return detail;
case TrafficStats.UID_REMOVED: case TrafficStats.UID_REMOVED:
detail.label = res.getString(R.string.data_usage_uninstalled_apps); detail.label = res.getString(UserManager.supportsMultipleUsers()
? R.string.data_usage_uninstalled_apps_users
: R.string.data_usage_uninstalled_apps);
detail.icon = pm.getDefaultActivityIcon(); detail.icon = pm.getDefaultActivityIcon();
return detail; return detail;
case TrafficStats.UID_TETHERING: case TrafficStats.UID_TETHERING: