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

Refactor DefaultAppPicker to a general radio button picker

Browse Source 
Bug: 36557316
Test: make RunSettingsRoboTests
Change-Id: I52985e527e55697cf29f8d97d775d4bbed025beb
This commit is contained in:
Fan Zhang
2017-03-23 11:03:29 -07:00
parent b3f13f9f32
commit a278962dbc
37 changed files with 580 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,31 +79,30 @@ public class DefaultAssistPicker extends DefaultAppPickerFragment {
continue;
}
packages.add(packageName);
candidates.add(new DefaultAppInfo(mUserId, info.component));
candidates.add(new DefaultAppInfo(mPm, mUserId, info.component));
}
return candidates;
}
@Override
protected String getDefaultAppKey() {
protected String getDefaultKey() {
final ComponentName cn = getCurrentAssist();
if (cn != null) {
return new DefaultAppInfo(mUserId, cn).getKey();
return new DefaultAppInfo(mPm, mUserId, cn).getKey();
}
return null;
}
@Override
protected String getConfirmationMessage(DefaultAppInfo appInfo) {
protected String getConfirmationMessage(CandidateInfo appInfo) {
if (appInfo == null) {
return null;
}
return getContext().getString(R.string.assistant_security_warning,
appInfo.loadLabel(mPm.getPackageManager()));
return getContext().getString(R.string.assistant_security_warning, appInfo.loadLabel());
}
@Override
protected boolean setDefaultAppKey(String key) {
protected boolean setDefaultKey(String key) {
if (TextUtils.isEmpty(key)) {
setAssistNone();
return true;