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

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;