Merge "Use IconDrawableFactory to load icons for default apps." (5317e70b) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/accessibility/ShortcutServicePickerFragment.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -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()),

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

+5 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -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;