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

Merge "Use IconDrawableFactory to load icons for default apps."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-18 17:47:33 +00:00
committed by Android (Google) Code Review
parent 63f32fcbf1 efa763624a
commit 5317e70be1
22 changed files with 137 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
View File

@@ -23,6 +23,7 @@ import android.app.Dialog;
import android.app.DialogFragment;
import android.app.Fragment;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Binder;
import android.os.Bundle;
@@ -54,7 +55,8 @@ public class ShortcutServicePickerFragment extends DefaultAppPickerFragment {
@Override
protected List<? extends DefaultAppInfo> getCandidates() {
final AccessibilityManager accessibilityManager = getContext()
final Context context = getContext();
final AccessibilityManager accessibilityManager = context
.getSystemService(AccessibilityManager.class);
final List<AccessibilityServiceInfo> installedServices =
accessibilityManager.getInstalledAccessibilityServiceList();
@@ -63,7 +65,7 @@ public class ShortcutServicePickerFragment extends DefaultAppPickerFragment {
List<DefaultAppInfo> candidates = new ArrayList<>(numInstalledServices);
for (int i = 0; i < numInstalledServices; i++) {
AccessibilityServiceInfo installedServiceInfo = installedServices.get(i);
candidates.add(new DefaultAppInfo(mPm,
candidates.add(new DefaultAppInfo(context, mPm,
UserHandle.myUserId(),
installedServiceInfo.getComponentName(),
(String) installedServiceInfo.loadSummary(mPm.getPackageManager()),

4
src/com/android/settings/applications/assist/DefaultAssistPicker.java
View File

@@ -79,7 +79,7 @@ public class DefaultAssistPicker extends DefaultAppPickerFragment {
continue;
}
packages.add(packageName);
candidates.add(new DefaultAppInfo(mPm, mUserId, info.component));
candidates.add(new DefaultAppInfo(getContext(), mPm, mUserId, info.component));
}
return candidates;
}
@@ -88,7 +88,7 @@ public class DefaultAssistPicker extends DefaultAppPickerFragment {
protected String getDefaultKey() {
final ComponentName cn = getCurrentAssist();
if (cn != null) {
return new DefaultAppInfo(mPm, mUserId, cn).getKey();
return new DefaultAppInfo(getContext(), mPm, mUserId, cn).getKey();
}
return null;
}

2
src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java
View File

@@ -87,7 +87,7 @@ public class DefaultAssistPreferenceController extends DefaultAppPreferenceContr
if (cn == null) {
return null;
}
return new DefaultAppInfo(mPackageManager, mUserId, cn);
return new DefaultAppInfo(mContext, mPackageManager, mUserId, cn);
}
@VisibleForTesting

9
src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java
View File

@@ -57,17 +57,18 @@ public class DefaultVoiceInputPicker extends DefaultAppPickerFragment {
@Override
protected List<VoiceInputDefaultAppInfo> getCandidates() {
final List<VoiceInputDefaultAppInfo> candidates = new ArrayList<>();
final Context context = getContext();
boolean hasEnabled = true;
for (VoiceInputHelper.InteractionInfo info : mHelper.mAvailableInteractionInfos) {
final boolean enabled = TextUtils.equals(info.key, mAssistRestrict);
hasEnabled |= enabled;
candidates.add(new VoiceInputDefaultAppInfo(mPm, mUserId, info, enabled));
candidates.add(new VoiceInputDefaultAppInfo(context, mPm, mUserId, info, enabled));
}
final boolean assistIsService = !hasEnabled;
for (VoiceInputHelper.RecognizerInfo info : mHelper.mAvailableRecognizerInfos) {
final boolean enabled = !assistIsService;
candidates.add(new VoiceInputDefaultAppInfo(mPm, mUserId, info, enabled));
candidates.add(new VoiceInputDefaultAppInfo(context, mPm, mUserId, info, enabled));
}
return candidates;
}
@@ -132,9 +133,9 @@ public class DefaultVoiceInputPicker extends DefaultAppPickerFragment {
public VoiceInputHelper.BaseInfo mInfo;
public VoiceInputDefaultAppInfo(PackageManagerWrapper pm, int userId,
public VoiceInputDefaultAppInfo(Context context, PackageManagerWrapper pm, int userId,
VoiceInputHelper.BaseInfo info, boolean enabled) {
super(pm, userId, info.componentName, null /* summary */, enabled);
super(context, pm, userId, info.componentName, null /* summary */, enabled);
mInfo = info;
}

8
src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
View File

@@ -104,15 +104,15 @@ public class DefaultVoiceInputPreferenceController extends DefaultAppPreferenceC
}
for (VoiceInputHelper.InteractionInfo info : mHelper.mAvailableInteractionInfos) {
if (TextUtils.equals(defaultKey, info.key)) {
return new DefaultVoiceInputPicker.VoiceInputDefaultAppInfo(mPackageManager,
mUserId, info, true /* enabled */);
return new DefaultVoiceInputPicker.VoiceInputDefaultAppInfo(mContext,
mPackageManager, mUserId, info, true /* enabled */);
}
}
for (VoiceInputHelper.RecognizerInfo info : mHelper.mAvailableRecognizerInfos) {
if (TextUtils.equals(defaultKey, info.key)) {
return new DefaultVoiceInputPicker.VoiceInputDefaultAppInfo(mPackageManager,
mUserId, info, true /* enabled */);
return new DefaultVoiceInputPicker.VoiceInputDefaultAppInfo(mContext,
mPackageManager, mUserId, info, true /* enabled */);
}
}
return null;

42
src/com/android/settings/applications/defaultapps/DefaultAppInfo.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.applications.defaultapps;
import android.app.AppGlobals;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.ComponentInfo;
import android.content.pm.PackageItemInfo;
@@ -25,6 +26,7 @@ import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
import android.os.RemoteException;
import android.os.UserHandle;
import android.util.IconDrawableFactory;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.wrapper.PackageManagerWrapper;
@@ -39,18 +41,20 @@ public class DefaultAppInfo extends RadioButtonPickerFragment.CandidateInfo {
public final PackageItemInfo packageItemInfo;
public final String summary;
protected final PackageManagerWrapper mPm;
private final Context mContext;
public DefaultAppInfo(PackageManagerWrapper pm, int uid, ComponentName cn) {
this(pm, uid, cn, null /* summary */);
public DefaultAppInfo(Context context, PackageManagerWrapper pm, int uid, ComponentName cn) {
this(context, pm, uid, cn, null /* summary */, true /* enabled */);
}
public DefaultAppInfo(PackageManagerWrapper pm, int uid, ComponentName cn, String summary) {
this(pm, uid, cn, summary, true /* enabled */);
public DefaultAppInfo(Context context, PackageManagerWrapper pm, PackageItemInfo info) {
this(context, pm, info, null /* summary */, true /* enabled */);
}
public DefaultAppInfo(PackageManagerWrapper pm, int uid, ComponentName cn, String summary,
boolean enabled) {
public DefaultAppInfo(Context context, PackageManagerWrapper pm, int uid, ComponentName cn,
String summary, boolean enabled) {
super(enabled);
mContext = context;
mPm = pm;
packageItemInfo = null;
userId = uid;
@@ -58,9 +62,10 @@ public class DefaultAppInfo extends RadioButtonPickerFragment.CandidateInfo {
this.summary = summary;
}
public DefaultAppInfo(PackageManagerWrapper pm, PackageItemInfo info, String summary,
boolean enabled) {
public DefaultAppInfo(Context context, PackageManagerWrapper pm, PackageItemInfo info,
String summary, boolean enabled) {
super(enabled);
mContext = context;
mPm = pm;
userId = UserHandle.myUserId();
packageItemInfo = info;
@@ -68,10 +73,6 @@ public class DefaultAppInfo extends RadioButtonPickerFragment.CandidateInfo {
this.summary = summary;
}
public DefaultAppInfo(PackageManagerWrapper pm, PackageItemInfo info) {
this(pm, info, null /* summary */, true /* enabled */);
}
@Override
public CharSequence loadLabel() {
if (componentName != null) {
@@ -97,22 +98,29 @@ public class DefaultAppInfo extends RadioButtonPickerFragment.CandidateInfo {
@Override
public Drawable loadIcon() {
final IconDrawableFactory factory = IconDrawableFactory.newInstance(mContext);
if (componentName != null) {
try {
final ComponentInfo componentInfo = getComponentInfo();
final ApplicationInfo appInfo = mPm.getApplicationInfoAsUser(
componentName.getPackageName(), 0, userId);
if (componentInfo != null) {
return componentInfo.loadIcon(mPm.getPackageManager());
return factory.getBadgedIcon(componentInfo, appInfo, userId);
} else {
final ApplicationInfo appInfo = mPm.getApplicationInfoAsUser(
componentName.getPackageName(), 0, userId);
return appInfo.loadIcon(mPm.getPackageManager());
return factory.getBadgedIcon(appInfo);
}
} catch (PackageManager.NameNotFoundException e) {
return null;
}
}
if (packageItemInfo != null) {
return packageItemInfo.loadIcon(mPm.getPackageManager());
try {
final ApplicationInfo appInfo = mPm.getApplicationInfoAsUser(
packageItemInfo.packageName, 0, userId);
return factory.getBadgedIcon(packageItemInfo, appInfo, userId);
} catch (PackageManager.NameNotFoundException e) {
return null;
}
} else {
return null;
}

3
src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
View File

@@ -187,10 +187,11 @@ public class DefaultAutofillPicker extends DefaultAppPickerFragment {
final List<DefaultAppInfo> candidates = new ArrayList<>();
final List<ResolveInfo> resolveInfos = mPm.getPackageManager()
.queryIntentServices(AUTOFILL_PROBE, PackageManager.GET_META_DATA);
final Context context = getContext();
for (ResolveInfo info : resolveInfos) {
final String permission = info.serviceInfo.permission;
if (Manifest.permission.BIND_AUTOFILL_SERVICE.equals(permission)) {
candidates.add(new DefaultAppInfo(mPm, mUserId, new ComponentName(
candidates.add(new DefaultAppInfo(context, mPm, mUserId, new ComponentName(
info.serviceInfo.packageName, info.serviceInfo.name)));
}
}

2
src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceController.java
View File

@@ -62,7 +62,7 @@ public class DefaultAutofillPreferenceController extends DefaultAppPreferenceCon
final String flattenComponent = Settings.Secure.getString(mContext.getContentResolver(),
DefaultAutofillPicker.SETTING);
if (!TextUtils.isEmpty(flattenComponent)) {
DefaultAppInfo appInfo = new DefaultAppInfo(mPackageManager,
DefaultAppInfo appInfo = new DefaultAppInfo(mContext, mPackageManager,
mUserId, ComponentName.unflattenFromString(flattenComponent));
return appInfo;
}

5
src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.applications.defaultapps;
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
@@ -47,7 +48,7 @@ public class DefaultBrowserPicker extends DefaultAppPickerFragment {
@Override
protected List<DefaultAppInfo> getCandidates() {
final List<DefaultAppInfo> candidates = new ArrayList<>();
final Context context = getContext();
// Resolve that intent and check that the handleAllWebDataURI boolean is set
final List<ResolveInfo> list = mPm.queryIntentActivitiesAsUser(
DefaultBrowserPreferenceController.BROWSE_PROBE, PackageManager.MATCH_ALL, mUserId);
@@ -59,7 +60,7 @@ public class DefaultBrowserPicker extends DefaultAppPickerFragment {
continue;
}
try {
candidates.add(new DefaultAppInfo(mPm,
candidates.add(new DefaultAppInfo(context, mPm,
mPm.getApplicationInfoAsUser(info.activityInfo.packageName, 0, mUserId)));
} catch (PackageManager.NameNotFoundException e) {
// Skip unknown packages.

2
src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
View File

@@ -67,7 +67,7 @@ public class DefaultBrowserPreferenceController extends DefaultAppPreferenceCont
try {
final String packageName = mPackageManager.getDefaultBrowserPackageNameAsUser(mUserId);
Log.d(TAG, "Get default browser package: " + packageName);
return new DefaultAppInfo(mPackageManager,
return new DefaultAppInfo(mContext, mPackageManager,
mPackageManager.getPackageManager().getApplicationInfo(packageName, 0));
} catch (PackageManager.NameNotFoundException e) {
return null;

4
src/com/android/settings/applications/defaultapps/DefaultEmergencyPicker.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.applications.defaultapps;
import android.content.ContentResolver;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
@@ -44,12 +45,13 @@ public class DefaultEmergencyPicker extends DefaultAppPickerFragment {
final List<ResolveInfo> infos = mPm.getPackageManager().queryIntentActivities(
DefaultEmergencyPreferenceController.QUERY_INTENT, 0);
PackageInfo bestMatch = null;
final Context context = getContext();
for (ResolveInfo info : infos) {
try {
final PackageInfo packageInfo =
mPm.getPackageManager().getPackageInfo(info.activityInfo.packageName, 0);
final ApplicationInfo appInfo = packageInfo.applicationInfo;
candidates.add(new DefaultAppInfo(mPm, appInfo));
candidates.add(new DefaultAppInfo(context, mPm, appInfo));
// Get earliest installed system app.
if (isSystemApp(appInfo) && (bestMatch == null ||
bestMatch.firstInstallTime > packageInfo.firstInstallTime)) {

3
src/com/android/settings/applications/defaultapps/DefaultHomePicker.java
View File

@@ -53,6 +53,7 @@ public class DefaultHomePicker extends DefaultAppPickerFragment {
final boolean mustSupportManagedProfile = hasManagedProfile();
final List<DefaultAppInfo> candidates = new ArrayList<>();
final List<ResolveInfo> homeActivities = new ArrayList<>();
final Context context = getContext();
mPm.getHomeActivities(homeActivities);
for (ResolveInfo resolveInfo : homeActivities) {
@@ -71,7 +72,7 @@ public class DefaultHomePicker extends DefaultAppPickerFragment {
summary = null;
}
final DefaultAppInfo candidate =
new DefaultAppInfo(mPm, mUserId, activityName, summary, enabled);
new DefaultAppInfo(context, mPm, mUserId, activityName, summary, enabled);
candidates.add(candidate);
}
return candidates;

5
src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
View File

@@ -61,11 +61,12 @@ public class DefaultHomePreferenceController extends DefaultAppPreferenceControl
final ArrayList<ResolveInfo> homeActivities = new ArrayList<>();
final ComponentName currentDefaultHome = mPackageManager.getHomeActivities(homeActivities);
if (currentDefaultHome != null) {
return new DefaultAppInfo(mPackageManager, mUserId, currentDefaultHome);
return new DefaultAppInfo(mContext, mPackageManager, mUserId, currentDefaultHome);
}
final ActivityInfo onlyAppInfo = getOnlyAppInfo();
if (onlyAppInfo != null) {
return new DefaultAppInfo(mPackageManager, mUserId, onlyAppInfo.getComponentName());
return new DefaultAppInfo(mContext, mPackageManager, mUserId,
onlyAppInfo.getComponentName());
}
return null;
}

3
src/com/android/settings/applications/defaultapps/DefaultPhonePicker.java
View File

@@ -48,9 +48,10 @@ public class DefaultPhonePicker extends DefaultAppPickerFragment {
final List<DefaultAppInfo> candidates = new ArrayList<>();
final List<String> dialerPackages =
DefaultDialerManager.getInstalledDialerApplications(getContext(), mUserId);
final Context context = getContext();
for (String packageName : dialerPackages) {
try {
candidates.add(new DefaultAppInfo(mPm,
candidates.add(new DefaultAppInfo(context, mPm,
mPm.getApplicationInfoAsUser(packageName, 0, mUserId)));
} catch (PackageManager.NameNotFoundException e) {
// Skip unknown packages.

2
src/com/android/settings/applications/defaultapps/DefaultPhonePreferenceController.java
View File

@@ -57,7 +57,7 @@ public class DefaultPhonePreferenceController extends DefaultAppPreferenceContro
@Override
protected DefaultAppInfo getDefaultAppInfo() {
try {
return new DefaultAppInfo(mPackageManager,
return new DefaultAppInfo(mContext, mPackageManager,
mPackageManager.getPackageManager().getApplicationInfo(
DefaultDialerManager.getDefaultDialerApplication(mContext, mUserId),
0));

5
src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java
View File

@@ -41,13 +41,14 @@ public class DefaultSmsPicker extends DefaultAppPickerFragment {
@Override
protected List<DefaultAppInfo> getCandidates() {
final Context context = getContext();
final Collection<SmsApplication.SmsApplicationData> smsApplications =
SmsApplication.getApplicationCollection(getContext());
SmsApplication.getApplicationCollection(context);
final List<DefaultAppInfo> candidates = new ArrayList<>(smsApplications.size());
for (SmsApplication.SmsApplicationData smsApplicationData : smsApplications) {
try {
candidates.add(new DefaultAppInfo(mPm,
candidates.add(new DefaultAppInfo(context, mPm,
mPm.getApplicationInfoAsUser(smsApplicationData.mPackageName, 0, mUserId)));
} catch (PackageManager.NameNotFoundException e) {
// Skip unknown packages.

2
src/com/android/settings/applications/defaultapps/DefaultSmsPreferenceController.java
View File

@@ -47,7 +47,7 @@ public class DefaultSmsPreferenceController extends DefaultAppPreferenceControll
protected DefaultAppInfo getDefaultAppInfo() {
final ComponentName app = SmsApplication.getDefaultSmsApplication(mContext, true);
if (app != null) {
return new DefaultAppInfo(mPackageManager, mUserId, app);
return new DefaultAppInfo(mContext, mPackageManager, mUserId, app);
}
return null;
}

2
src/com/android/settings/development/WebViewAppPreferenceControllerV2.java
View File

@@ -85,7 +85,7 @@ public class WebViewAppPreferenceControllerV2 extends
@VisibleForTesting
DefaultAppInfo getDefaultAppInfo() {
final PackageInfo currentPackage = mWebViewUpdateServiceWrapper.getCurrentWebViewPackage();
return new DefaultAppInfo(mPackageManager,
return new DefaultAppInfo(mContext, mPackageManager,
currentPackage == null ? null : currentPackage.applicationInfo);
}

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 */);
}

2
src/com/android/settings/webview/WebViewAppPreferenceController.java
View File

@@ -46,7 +46,7 @@ public class WebViewAppPreferenceController extends DefaultAppPreferenceControll
@Override
public DefaultAppInfo getDefaultAppInfo() {
PackageInfo currentPackage = mWebViewUpdateServiceWrapper.getCurrentWebViewPackage();
return new DefaultAppInfo(mPackageManager,
return new DefaultAppInfo(mContext, mPackageManager,
currentPackage == null ? null : currentPackage.applicationInfo);
}