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

Settings: Move DefaultAppInfo CandidateInfo to SettingsLib

Browse Source 
Bug: 3600711
Test: Moved DefaultAppInfoTest to SettingsLib
      m RunSettingsRoboTests
Change-Id: If9e2288009277f1940b9769790b78bb0a58b626a
This commit is contained in:
Dake Gu
2018-02-20 17:02:12 -08:00
parent 87a17d01a6
commit fef14cac00
42 changed files with 54 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,153 +0,0 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
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;
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;
/**
* Data model representing an app in DefaultAppPicker UI.
*/
public class DefaultAppInfo extends RadioButtonPickerFragment.CandidateInfo {
public final int userId;
public final ComponentName componentName;
public final PackageItemInfo packageItemInfo;
public final String summary;
protected final PackageManagerWrapper mPm;
private final Context mContext;
public DefaultAppInfo(Context context, PackageManagerWrapper pm, int uid, ComponentName cn) {
this(context, pm, uid, cn, null /* summary */, true /* enabled */);
}
public DefaultAppInfo(Context context, PackageManagerWrapper pm, PackageItemInfo info) {
this(context, pm, info, null /* summary */, true /* 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;
componentName = cn;
this.summary = summary;
}
public DefaultAppInfo(Context context, PackageManagerWrapper pm, PackageItemInfo info,
String summary, boolean enabled) {
super(enabled);
mContext = context;
mPm = pm;
userId = UserHandle.myUserId();
packageItemInfo = info;
componentName = null;
this.summary = summary;
}
@Override
public CharSequence loadLabel() {
if (componentName != null) {
try {
final ComponentInfo componentInfo = getComponentInfo();
if (componentInfo != null) {
return componentInfo.loadLabel(mPm.getPackageManager());
} else {
final ApplicationInfo appInfo = mPm.getApplicationInfoAsUser(
componentName.getPackageName(), 0, userId);
return appInfo.loadLabel(mPm.getPackageManager());
}
} catch (PackageManager.NameNotFoundException e) {
return null;
}
} else if (packageItemInfo != null) {
return packageItemInfo.loadLabel(mPm.getPackageManager());
} else {
return null;
}
}
@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 factory.getBadgedIcon(componentInfo, appInfo, userId);
} else {
return factory.getBadgedIcon(appInfo);
}
} catch (PackageManager.NameNotFoundException e) {
return null;
}
}
if (packageItemInfo != null) {
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;
}
}
@Override
public String getKey() {
if (componentName != null) {
return componentName.flattenToString();
} else if (packageItemInfo != null) {
return packageItemInfo.packageName;
} else {
return null;
}
}
private ComponentInfo getComponentInfo() {
try {
ComponentInfo componentInfo = AppGlobals.getPackageManager().getActivityInfo(
componentName, 0, userId);
if (componentInfo == null) {
componentInfo = AppGlobals.getPackageManager().getServiceInfo(
componentName, 0, userId);
}
return componentInfo;
} catch (RemoteException e) {
return null;
}
}
}

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

@@ -32,6 +32,8 @@ import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settings.widget.RadioButtonPreference;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.widget.CandidateInfo;
import com.android.settingslib.wrapper.PackageManagerWrapper;
/**

1
src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
View File

@@ -29,6 +29,7 @@ import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.widget.GearPreference;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.TwoTargetPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.wrapper.PackageManagerWrapper;

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

@@ -38,7 +38,9 @@ import android.util.Log;
import com.android.internal.content.PackageMonitor;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.utils.ThreadUtils;
import com.android.settingslib.widget.CandidateInfo;
import java.util.ArrayList;
import java.util.List;
@@ -186,8 +188,8 @@ public class DefaultAutofillPicker extends DefaultAppPickerFragment {
@Override
protected List<DefaultAppInfo> getCandidates() {
final List<DefaultAppInfo> candidates = new ArrayList<>();
final List<ResolveInfo> resolveInfos = mPm.getPackageManager()
.queryIntentServices(AUTOFILL_PROBE, PackageManager.GET_META_DATA);
final List<ResolveInfo> resolveInfos = mPm.queryIntentServices(
AUTOFILL_PROBE, PackageManager.GET_META_DATA);
final Context context = getContext();
for (ResolveInfo info : resolveInfos) {
final String permission = info.serviceInfo.permission;

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

@@ -24,6 +24,7 @@ import android.text.TextUtils;
import android.view.autofill.AutofillManager;
import com.android.settings.wrapper.AutofillManagerWrapper;
import com.android.settingslib.applications.DefaultAppInfo;
public class DefaultAutofillPreferenceController extends DefaultAppPreferenceController {
private AutofillManagerWrapper mAutofillManager;

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

@@ -23,6 +23,8 @@ import android.content.pm.ResolveInfo;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.applications.DefaultAppInfo;
import java.util.ArrayList;
import java.util.List;

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

@@ -29,6 +29,8 @@ import android.text.TextUtils;
import android.util.IconDrawableFactory;
import android.util.Log;
import com.android.settingslib.applications.DefaultAppInfo;
import java.util.List;
public class DefaultBrowserPreferenceController extends DefaultAppPreferenceController {

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

@@ -28,6 +28,8 @@ import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.widget.CandidateInfo;
import java.util.ArrayList;
import java.util.List;

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

@@ -22,6 +22,8 @@ import android.content.pm.ResolveInfo;
import android.provider.Settings;
import android.telephony.TelephonyManager;
import com.android.settingslib.applications.DefaultAppInfo;
import java.util.List;
public class DefaultEmergencyPreferenceController extends DefaultAppPreferenceController {

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

@@ -30,6 +30,7 @@ import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.applications.DefaultAppInfo;
import java.util.ArrayList;
import java.util.List;

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

@@ -25,6 +25,7 @@ import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import com.android.settings.R;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import java.util.ArrayList;

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

@@ -24,6 +24,7 @@ import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.applications.DefaultAppInfo;
import java.util.ArrayList;
import java.util.List;

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

@@ -23,6 +23,8 @@ import android.os.UserManager;
import android.telecom.DefaultDialerManager;
import android.telephony.TelephonyManager;
import com.android.settingslib.applications.DefaultAppInfo;
import java.util.List;
public class DefaultPhonePreferenceController extends DefaultAppPreferenceController {

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

@@ -25,6 +25,8 @@ import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.telephony.SmsApplication;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.widget.CandidateInfo;
import java.util.ArrayList;
import java.util.Collection;

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

@@ -21,6 +21,7 @@ import android.content.Context;
import android.telephony.TelephonyManager;
import com.android.internal.telephony.SmsApplication;
import com.android.settingslib.applications.DefaultAppInfo;
import java.util.Collection;

1
src/com/android/settings/applications/defaultapps/DefaultWorkBrowserPreferenceController.java
View File

@@ -21,6 +21,7 @@ import android.os.UserHandle;
import com.android.settings.Utils;
public class DefaultWorkBrowserPreferenceController extends DefaultBrowserPreferenceController {
public static final String KEY = "work_default_browser";