diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1e29144bdf7..f5854b4a98c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6622,11 +6622,6 @@
No permissions requested
-
- Some defaults set
-
- No defaults set
-
All apps
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 468d568a1b3..7129a814ae8 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -1024,17 +1024,6 @@ public final class Utils {
return bitmap;
}
- public static boolean hasUsbDefaults(IUsbManager usbManager, String packageName) {
- try {
- if (usbManager != null) {
- return usbManager.hasDefaults(packageName, UserHandle.myUserId());
- }
- } catch (RemoteException e) {
- Log.e(TAG, "mUsbManager.hasDefaults", e);
- }
- return false;
- }
-
public static boolean hasPreferredActivities(PackageManager pm, String packageName) {
// Get list of preferred activities
List prefActList = new ArrayList<>();
@@ -1069,20 +1058,6 @@ public final class Utils {
return result;
}
- public static CharSequence getLaunchByDeafaultSummary(ApplicationsState.AppEntry appEntry,
- IUsbManager usbManager, PackageManager pm, Context context) {
- String packageName = appEntry.info.packageName;
- boolean hasPreferred = hasPreferredActivities(pm, packageName)
- || hasUsbDefaults(usbManager, packageName);
- int status = pm.getIntentVerificationStatus(packageName, UserHandle.myUserId());
- // consider a visible current link-handling state to be any explicitly designated behavior
- boolean hasDomainURLsPreference =
- status != PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED;
- return context.getString(hasPreferred || hasDomainURLsPreference
- ? R.string.launch_defaults_some
- : R.string.launch_defaults_none);
- }
-
public static void handleLoadingContainer(View loading, View doneLoading, boolean done,
boolean animate) {
setViewShown(loading, !done, animate);
diff --git a/src/com/android/settings/applications/ClearDefaultsPreference.java b/src/com/android/settings/applications/ClearDefaultsPreference.java
index 96a9b3fb31d..3a63a663b04 100644
--- a/src/com/android/settings/applications/ClearDefaultsPreference.java
+++ b/src/com/android/settings/applications/ClearDefaultsPreference.java
@@ -36,7 +36,7 @@ import android.widget.Button;
import android.widget.TextView;
import com.android.settings.R;
-import com.android.settings.Utils;
+import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
public class ClearDefaultsPreference extends Preference {
@@ -117,9 +117,9 @@ public class ClearDefaultsPreference extends Preference {
mAppWidgetManager.hasBindAppWidgetPermission(mAppEntry.info.packageName);
TextView autoLaunchView = (TextView) view.findViewById(R.id.auto_launch);
- boolean autoLaunchEnabled = Utils.hasPreferredActivities(mPm, mPackageName)
+ boolean autoLaunchEnabled = AppUtils.hasPreferredActivities(mPm, mPackageName)
|| isDefaultBrowser(mPackageName)
- || Utils.hasUsbDefaults(mUsbManager, mPackageName);
+ || AppUtils.hasUsbDefaults(mUsbManager, mPackageName);
if (!autoLaunchEnabled && !hasBindAppWidgetPermission) {
resetLaunchDefaultsUi(autoLaunchView);
} else {
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index feb47cd603c..dc09c45d32d 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -79,6 +79,7 @@ import com.android.settings.notification.AppNotificationSettings;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.NotificationBackend.AppRow;
import com.android.settingslib.AppItem;
+import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.net.ChartData;
@@ -504,7 +505,7 @@ public class InstalledAppDetails extends AppInfoBase
}
mPermissionReceiver = PermissionsSummaryHelper.getPermissionSummary(getContext(),
mPackageName, mPermissionCallback);
- mLaunchPreference.setSummary(Utils.getLaunchByDeafaultSummary(mAppEntry, mUsbManager,
+ mLaunchPreference.setSummary(AppUtils.getLaunchByDefaultSummary(mAppEntry, mUsbManager,
mPm, context));
mNotificationPreference.setSummary(getNotificationSummary(mAppEntry, context,
mBackend));