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

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

@@ -52,8 +52,7 @@ public class DefaultBrowserPreferenceController extends DefaultAppPreferenceCont
public void updateState(Preference preference) {
super.updateState(preference);
final DefaultAppInfo defaultApp = getDefaultAppInfo();
final CharSequence defaultAppLabel = defaultApp != null
? defaultApp.loadLabel(mPackageManager.getPackageManager()) : null;
final CharSequence defaultAppLabel = defaultApp != null ? defaultApp.loadLabel() : null;
if (TextUtils.isEmpty(defaultAppLabel)) {
final String onlyAppLabel = getOnlyAppLabel();
if (!TextUtils.isEmpty(onlyAppLabel)) {
@@ -65,8 +64,9 @@ public class DefaultBrowserPreferenceController extends DefaultAppPreferenceCont
@Override
protected DefaultAppInfo getDefaultAppInfo() {
try {
return new DefaultAppInfo(mPackageManager.getPackageManager().getApplicationInfo(
mPackageManager.getDefaultBrowserPackageNameAsUser(mUserId), 0));
return new DefaultAppInfo(mPackageManager,
mPackageManager.getPackageManager().getApplicationInfo(
mPackageManager.getDefaultBrowserPackageNameAsUser(mUserId), 0));
} catch (PackageManager.NameNotFoundException e) {
return null;
}