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

Merge "WebView implementation Dev setting: Show the version number after name"

Browse Source
This commit is contained in:
Gustav Sennton
2017-03-13 14:25:27 +00:00
committed by Android (Google) Code Review
parent 0f0e3adac8 75f0b1b2e4
commit 72c7a83141
2 changed files with 53 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,9 @@ import static android.provider.Settings.ACTION_WEBVIEW_SETTINGS;
import android.app.Activity;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageItemInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.Context;
import android.support.annotation.VisibleForTesting;
import android.text.TextUtils;
@@ -60,8 +62,8 @@ public class WebViewAppPicker extends DefaultAppPickerFragment {
getWebViewUpdateServiceWrapper().getValidWebViewApplicationInfos(getContext());
for (ApplicationInfo ai : pkgs) {
packageInfoList.add(createDefaultAppInfo(ai,
getDisabledReason(getWebViewUpdateServiceWrapper(),
getContext(), ai.packageName)));
getDisabledReason(getWebViewUpdateServiceWrapper(),
getContext(), ai.packageName)));
}
return packageInfoList;
}
@@ -107,10 +109,26 @@ public class WebViewAppPicker extends DefaultAppPickerFragment {
return MetricsEvent.WEBVIEW_IMPLEMENTATION;
}
private static class WebViewAppInfo extends DefaultAppInfo {
public WebViewAppInfo(PackageItemInfo packageItemInfo, String summary, boolean enabled) {
super(packageItemInfo, summary, enabled);
}
@Override
public CharSequence loadLabel(PackageManager pm) {
String versionName = "";
try {
versionName = pm.getPackageInfo(packageItemInfo.packageName, 0).versionName;
} catch (PackageManager.NameNotFoundException e) {
}
return String.format("%s %s", super.loadLabel(pm), versionName);
}
}
@VisibleForTesting
DefaultAppInfo createDefaultAppInfo(
ApplicationInfo applicationInfo, String disabledReason) {
return new DefaultAppInfo(applicationInfo, disabledReason,
DefaultAppInfo createDefaultAppInfo(PackageItemInfo packageItemInfo, String disabledReason) {
return new WebViewAppInfo(packageItemInfo, disabledReason,
TextUtils.isEmpty(disabledReason) /* enabled */);
}