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

Merge "Show removed user's data usage under its correct item" into lmp-mr1-dev

Browse Source
This commit is contained in:
Zoltan Szatmary-Ban
2015-01-23 10:57:13 +00:00
committed by Android (Google) Code Review
parent 5f1eb2d72a 77c1d36de5
commit 387597a256
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/DataUsageSummary.java
View File

@@ -62,6 +62,7 @@ import android.content.Intent;
import android.content.Loader; import android.content.Loader;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.content.res.Resources; import android.content.res.Resources;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.Color; import android.graphics.Color;
@@ -141,6 +142,7 @@ import com.android.settings.sim.SimSettings;
import com.android.settings.widget.ChartDataUsageView; import com.android.settings.widget.ChartDataUsageView;
import com.android.settings.widget.ChartDataUsageView.DataUsageChartListener; import com.android.settings.widget.ChartDataUsageView.DataUsageChartListener;
import com.android.settings.widget.ChartNetworkSeriesView; import com.android.settings.widget.ChartNetworkSeriesView;
import com.google.android.collect.Lists; import com.google.android.collect.Lists;
import libcore.util.Objects; import libcore.util.Objects;
@@ -1701,9 +1703,16 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
collapseKey = uid; collapseKey = uid;
category = AppItem.CATEGORY_APP; category = AppItem.CATEGORY_APP;
} else { } else {
// Add to other user item. // If it is a removed user add it to the removed users' key
collapseKey = UidDetailProvider.buildKeyForUser(userId); final UserInfo info = mUm.getUserInfo(userId);
category = AppItem.CATEGORY_USER; if (info == null) {
collapseKey = UID_REMOVED;
category = AppItem.CATEGORY_APP;
} else {
// Add to other user item.
collapseKey = UidDetailProvider.buildKeyForUser(userId);
category = AppItem.CATEGORY_USER;
}
} }
} else if (uid == UID_REMOVED || uid == UID_TETHERING) { } else if (uid == UID_REMOVED || uid == UID_TETHERING) {
collapseKey = uid; collapseKey = uid;