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

Fix non-app non-user preferences in Settings > Data usage am: afea1cae25

Browse Source 
am: 63170fbf7a

Change-Id: Iabfb95c0b071b8ebe2ab8a659d323a9cda2656d5
This commit is contained in:
Zoltan Szatmary-Ban
2016-06-21 15:55:07 +00:00
committed by android-build-merger
parent 1b6d911793 63170fbf7a
commit 3b629c6918
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/datausage/AppDataUsage.java
View File

@@ -187,6 +187,11 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
} else { } else {
removePreference(KEY_APP_LIST); removePreference(KEY_APP_LIST);
} }
} else {
if (mAppItem.key == TrafficStats.UID_REMOVED) {
mLabel = getContext().getString(R.string.data_usage_uninstalled_apps_users);
} else if (mAppItem.key == TrafficStats.UID_TETHERING) {
mLabel = getContext().getString(R.string.tether_settings_title_all);
} else { } else {
final int userId = UidDetailProvider.getUserIdForKey(mAppItem.key); final int userId = UidDetailProvider.getUserIdForKey(mAppItem.key);
final UserManager um = UserManager.get(getActivity()); final UserManager um = UserManager.get(getActivity());
@@ -195,6 +200,7 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
mIcon = Utils.getUserIcon(getActivity(), um, info); mIcon = Utils.getUserIcon(getActivity(), um, info);
mLabel = Utils.getUserLabel(getActivity(), info); mLabel = Utils.getUserLabel(getActivity(), info);
mPackageName = getActivity().getPackageName(); mPackageName = getActivity().getPackageName();
}
removePreference(KEY_UNRESTRICTED_DATA); removePreference(KEY_UNRESTRICTED_DATA);
removePreference(KEY_APP_SETTINGS); removePreference(KEY_APP_SETTINGS);
removePreference(KEY_RESTRICT_BACKGROUND); removePreference(KEY_RESTRICT_BACKGROUND);