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

Use IconDrawableFactory to load icons for default apps.

Browse Source 
Bug: 64336923
Test: robotests
Change-Id: I2a4ca05a866784f97e247bad1c1679a6ec0f5efa
This commit is contained in:
Fan Zhang
2017-10-17 11:35:37 -07:00
parent 24ff765731
commit efa763624a
22 changed files with 137 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/settings/webview/WebViewAppPicker.java
View File

@@ -60,12 +60,13 @@ public class WebViewAppPicker extends DefaultAppPickerFragment {
@Override
protected List<DefaultAppInfo> getCandidates() {
final List<DefaultAppInfo> packageInfoList = new ArrayList<DefaultAppInfo>();
List<ApplicationInfo> pkgs =
getWebViewUpdateServiceWrapper().getValidWebViewApplicationInfos(getContext());
final Context context = getContext();
final WebViewUpdateServiceWrapper webViewUpdateService = getWebViewUpdateServiceWrapper();
final List<ApplicationInfo> pkgs =
webViewUpdateService.getValidWebViewApplicationInfos(context);
for (ApplicationInfo ai : pkgs) {
packageInfoList.add(createDefaultAppInfo(mPm, ai,
getDisabledReason(getWebViewUpdateServiceWrapper(),
getContext(), ai.packageName)));
packageInfoList.add(createDefaultAppInfo(context, mPm, ai,
getDisabledReason(webViewUpdateService, context, ai.packageName)));
}
return packageInfoList;
}
@@ -112,9 +113,9 @@ public class WebViewAppPicker extends DefaultAppPickerFragment {
}
private static class WebViewAppInfo extends DefaultAppInfo {
public WebViewAppInfo(PackageManagerWrapper pm, PackageItemInfo packageItemInfo,
String summary, boolean enabled) {
super(pm, packageItemInfo, summary, enabled);
public WebViewAppInfo(Context context, PackageManagerWrapper pm,
PackageItemInfo packageItemInfo, String summary, boolean enabled) {
super(context, pm, packageItemInfo, summary, enabled);
}
@Override
@@ -131,9 +132,9 @@ public class WebViewAppPicker extends DefaultAppPickerFragment {
@VisibleForTesting
DefaultAppInfo createDefaultAppInfo(PackageManagerWrapper pm, PackageItemInfo packageItemInfo,
String disabledReason) {
return new WebViewAppInfo(pm, packageItemInfo, disabledReason,
DefaultAppInfo createDefaultAppInfo(Context context, PackageManagerWrapper pm,
PackageItemInfo packageItemInfo, String disabledReason) {
return new WebViewAppInfo(context, pm, packageItemInfo, disabledReason,
TextUtils.isEmpty(disabledReason) /* enabled */);
}