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

resolve merge conflicts of 86c72f7ea5 to oc-dev-plus-aosp

Browse Source 
Test: make RunSettingsRoboTests -j
Change-Id: If6b87d1caa358335ce56201eab0ed8add8b339e9
This commit is contained in:
Robin Lee
2017-03-29 13:54:02 +01:00
parent 530c6dbbd8 86c72f7ea5
commit 27ae2bb1fe
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,6 +50,7 @@ import com.android.settingslib.AppItem;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.settingslib.net.ChartData; import com.android.settingslib.net.ChartData;
import com.android.settingslib.net.ChartDataLoader; import com.android.settingslib.net.ChartDataLoader;
import com.android.settingslib.net.UidDetail;
import com.android.settingslib.net.UidDetailProvider; import com.android.settingslib.net.UidDetailProvider;
import java.util.concurrent.BlockingQueue; import java.util.concurrent.BlockingQueue;
@@ -207,22 +208,12 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
removePreference(KEY_APP_LIST); removePreference(KEY_APP_LIST);
} }
} else { } else {
if (mAppItem.key == TrafficStats.UID_REMOVED) { final Context context = getActivity();
mLabel = getContext().getString(R.string.data_usage_uninstalled_apps_users); UidDetail uidDetail = new UidDetailProvider(context).getUidDetail(mAppItem.key, true);
} else if (mAppItem.key == TrafficStats.UID_TETHERING) { mIcon = uidDetail.icon;
mLabel = getContext().getString(R.string.tether_settings_title_all); mLabel = uidDetail.label;
} else { mPackageName = context.getPackageName();
final int userId = UidDetailProvider.getUserIdForKey(mAppItem.key);
final UserManager um = UserManager.get(getActivity());
final UserInfo info = um.getUserInfo(userId);
if (info != null) {
mIcon = Utils.getUserIcon(getActivity(), um, info);
mLabel = Utils.getUserLabel(getActivity(), info);
} else {
mLabel = getContext().getString(R.string.data_usage_uninstalled_apps_users);
}
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);