Merge "Settings: Move DefaultAppInfo CandidateInfo to SettingsLib" (158096d2) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/accessibility/ShortcutServicePickerFragment.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -22,13 +22,10 @@ import static com.android.internal.accessibility.AccessibilityShortcutController
		import android.accessibilityservice.AccessibilityServiceInfo;
		import android.app.Activity;
		import android.app.Dialog;
		import android.app.DialogFragment;
		import android.app.Fragment;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.DialogInterface;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.ComponentInfo;
		import android.content.pm.PackageManager;
		import android.graphics.drawable.Drawable;
		import android.os.Binder;
		@@ -44,13 +41,12 @@ import com.android.internal.accessibility.AccessibilityShortcutController;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.internal.accessibility.AccessibilityShortcutController.ToggleableFrameworkFeatureInfo;
		import com.android.settings.R;
		import com.android.settings.applications.defaultapps.DefaultAppInfo;
		import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
		import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
		import com.android.settings.widget.RadioButtonPickerFragment;
		import com.android.settings.widget.RadioButtonPreference;
		import com.android.settings.wrapper.IPackageManagerWrapper;
		import com.android.settingslib.accessibility.AccessibilityUtils;
		import com.android.settingslib.applications.DefaultAppInfo;
		import com.android.settingslib.widget.CandidateInfo;
		import com.android.settingslib.wrapper.PackageManagerWrapper;

		import java.util.ArrayList;

src/com/android/settings/accessibility/VibrationPreferenceFragment.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import com.android.internal.accessibility.AccessibilityShortcutController;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.R;
		import com.android.settings.widget.RadioButtonPickerFragment;
		import com.android.settingslib.widget.CandidateInfo;

		import java.util.ArrayList;
		import java.util.Comparator;

src/com/android/settings/applications/assist/DefaultAssistPicker.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -31,9 +31,11 @@ import android.util.Log;
		import com.android.internal.app.AssistUtils;
		import com.android.internal.logging.nano.MetricsProto;
		import com.android.settings.R;
		import com.android.settings.applications.defaultapps.DefaultAppInfo;
		import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;

		import com.android.settingslib.applications.DefaultAppInfo;
		import com.android.settingslib.widget.CandidateInfo;

		import java.util.ArrayList;
		import java.util.List;

src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,8 +27,8 @@ import android.support.annotation.VisibleForTesting;

		import com.android.internal.app.AssistUtils;
		import com.android.settings.R;
		import com.android.settings.applications.defaultapps.DefaultAppInfo;
		import com.android.settings.applications.defaultapps.DefaultAppPreferenceController;
		import com.android.settingslib.applications.DefaultAppInfo;

		import java.util.List;

src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,8 +25,8 @@ import android.text.TextUtils;
		import com.android.internal.app.AssistUtils;
		import com.android.internal.logging.nano.MetricsProto;
		import com.android.settings.R;
		import com.android.settings.applications.defaultapps.DefaultAppInfo;
		import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
		import com.android.settingslib.applications.DefaultAppInfo;
		import com.android.settingslib.wrapper.PackageManagerWrapper;

		import java.util.ArrayList;