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

Commit 99340f36 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

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

parents 801a1588 6bf72119

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -4032,6 +4032,8 @@ 


    <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->

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

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

src/com/android/settings/net/UidDetailProvider.java

+3 −1
Original line number Diff line number Diff line
@@ -101,7 +101,9 @@ public class UidDetailProvider { 
                detail.icon = pm.getDefaultActivityIcon();

                return detail;

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

                return detail;

            case TrafficStats.UID_TETHERING: