Merge "Show default app icon in default app screen." (a7b04ed6) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+1 −6

Original line number	Diff line number	Diff line
		@@ -2496,11 +2496,6 @@
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter android:priority="10">
		<action android:name="com.android.settings.action.SETTINGS" />
		</intent-filter>
		<meta-data android:name="com.android.settings.category"
		android:value="com.android.settings.category.ia.apps.default" />
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.nfc.PaymentSettings" />
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		@@ -3001,7 +2996,7 @@
		<meta-data android:name="com.android.settings.category"
		android:value="com.android.settings.category.ia.apps"/>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.applications.AdvancedAppSettings" />
		android:value="com.android.settings.applications.DefaultAppSettings" />
		<meta-data android:name="com.android.settings.summary"
		android:resource="@string/summary_empty"/>
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

res/xml/app_default_settings.xml

+17 −17

Original line number	Diff line number	Diff line
		@@ -23,14 +23,12 @@
		<Preference
		android:key="assist_and_voice_input"
		android:title="@string/assist_and_voice_input_title"
		android:fragment="com.android.settings.applications.assist.ManageAssist"
		android:order="-20"/>
		android:fragment="com.android.settings.applications.assist.ManageAssist" />

		<Preference
		android:key="default_browser"
		android:title="@string/default_browser_title"
		android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker"
		android:order="-19">
		android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker">
		<extra android:name="for_work" android:value="false" />
		</Preference>

		@@ -38,35 +36,37 @@
		android:key="default_home"
		android:title="@string/home_app"
		android:fragment="com.android.settings.applications.defaultapps.DefaultHomePicker"
		settings:keywords="@string/keywords_home"
		android:order="-18"/>
		settings:keywords="@string/keywords_home" />

		<Preference
		android:key="default_phone_app"
		android:title="@string/default_phone_title"
		android:fragment="com.android.settings.applications.defaultapps.DefaultPhonePicker"
		settings:keywords="@string/keywords_default_phone_app"
		android:order="-17"/>
		settings:keywords="@string/keywords_default_phone_app" />

		<Preference
		android:key="default_sms_app"
		android:title="@string/sms_application_title"
		android:fragment="com.android.settings.applications.defaultapps.DefaultSmsPicker"
		settings:keywords="@string/keywords_more_default_sms_app"
		android:order="-16"/>
		settings:keywords="@string/keywords_more_default_sms_app" />

		<Preference
		android:key="default_payment_app"
		android:title="@string/nfc_payment_settings_title"
		android:summary="@string/summary_placeholder"
		android:fragment="com.android.settings.nfc.PaymentSettings" />

		<Preference
		android:key="default_emergency_app"
		android:title="@string/default_emergency_app"
		settings:keywords="@string/keywords_emergency_app"
		android:order="-15"/>
		settings:keywords="@string/keywords_emergency_app" />

		<!--
		<Preference
		android:key="default_notification_asst_app"
		android:title="@string/default_notification_assistant"
		android:fragment="com.android.settings.applications.defaultapps.DefaultNotificationAssistantPicker"
		android:order="-13"/>
		/>
		-->

		<Preference

src/com/android/settings/SettingsActivity.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -813,13 +813,6 @@ public class SettingsActivity extends SettingsDrawerActivity
		Settings.DateTimeSettingsActivity.class.getName()),
		!UserManager.isDeviceInDemoMode(this), isAdmin)
		\|\| somethingChanged;
		NfcAdapter adapter = NfcAdapter.getDefaultAdapter(this);
		somethingChanged = setTileEnabled(new ComponentName(packageName,
		Settings.PaymentSettingsActivity.class.getName()),
		pm.hasSystemFeature(PackageManager.FEATURE_NFC)
		&& pm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)
		&& adapter != null && adapter.isEnabled(), isAdmin)
		\|\| somethingChanged;

		somethingChanged = setTileEnabled(new ComponentName(packageName,
		Settings.PrintSettingsActivity.class.getName()),

src/com/android/settings/applications/AdvancedAppSettings.java→src/com/android/settings/applications/DefaultAppSettings.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.text.TextUtils;

		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.R;
		import com.android.settings.applications.assist.DefaultAssistPreferenceController;
		import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
		import com.android.settings.applications.defaultapps.DefaultEmergencyPreferenceController;
		import com.android.settings.applications.defaultapps.DefaultHomePreferenceController;
		@@ -29,6 +30,7 @@ import com.android.settings.applications.defaultapps.DefaultPhonePreferenceContr
		import com.android.settings.applications.defaultapps.DefaultSmsPreferenceController;
		import com.android.settings.applications.defaultapps.DefaultWorkBrowserPreferenceController;
		import com.android.settings.applications.defaultapps.DefaultWorkPhonePreferenceController;
		import com.android.settings.applications.defaultapps.DefaultPaymentSettingsPreferenceController;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settings.dashboard.SummaryLoader;
		import com.android.settings.search.BaseSearchIndexProvider;
		@@ -39,9 +41,9 @@ import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.List;

		public class AdvancedAppSettings extends DashboardFragment {
		public class DefaultAppSettings extends DashboardFragment {

		static final String TAG = "AdvancedAppSettings";
		static final String TAG = "DefaultAppSettings";

		private static final String KEY_ASSIST_VOICE_INPUT = "assist_and_voice_input";

		@@ -67,6 +69,8 @@ public class AdvancedAppSettings extends DashboardFragment {

		private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
		final List<AbstractPreferenceController> controllers = new ArrayList<>();
		controllers.add(new DefaultAssistPreferenceController(context, KEY_ASSIST_VOICE_INPUT,
		false /* showSetting */));
		controllers.add(new DefaultBrowserPreferenceController(context));
		controllers.add(new DefaultWorkBrowserPreferenceController(context));
		controllers.add(new DefaultPhonePreferenceController(context));
		@@ -74,6 +78,7 @@ public class AdvancedAppSettings extends DashboardFragment {
		controllers.add(new DefaultSmsPreferenceController(context));
		controllers.add(new DefaultEmergencyPreferenceController(context));
		controllers.add(new DefaultHomePreferenceController(context));
		controllers.add(new DefaultPaymentSettingsPreferenceController(context));
		return controllers;
		}

		@@ -100,7 +105,8 @@ public class AdvancedAppSettings extends DashboardFragment {
		}

		@Override
		public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
		public List<AbstractPreferenceController> getPreferenceControllers(
		Context context) {
		return buildPreferenceControllers(context);
		}
		};
		@@ -152,7 +158,7 @@ public class AdvancedAppSettings extends DashboardFragment {
		@Override
		public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
		SummaryLoader summaryLoader) {
		return new AdvancedAppSettings.SummaryProvider(activity, summaryLoader);
		return new DefaultAppSettings.SummaryProvider(activity, summaryLoader);
		}
		};
		}

src/com/android/settings/applications/InstalledAppDetails.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -1070,27 +1070,27 @@ public class InstalledAppDetails extends AppInfoBase
		final Context context = getContext();
		if (DefaultHomePreferenceController.hasHomePreference(mPackageName, context)) {
		screen.addPreference(new ShortcutPreference(getPrefContext(),
		AdvancedAppSettings.class, "default_home", R.string.home_app,
		DefaultAppSettings.class, "default_home", R.string.home_app,
		R.string.configure_apps));
		}
		if (DefaultBrowserPreferenceController.hasBrowserPreference(mPackageName, context)) {
		screen.addPreference(new ShortcutPreference(getPrefContext(),
		AdvancedAppSettings.class, "default_browser", R.string.default_browser_title,
		DefaultAppSettings.class, "default_browser", R.string.default_browser_title,
		R.string.configure_apps));
		}
		if (DefaultPhonePreferenceController.hasPhonePreference(mPackageName, context)) {
		screen.addPreference(new ShortcutPreference(getPrefContext(),
		AdvancedAppSettings.class, "default_phone_app", R.string.default_phone_title,
		DefaultAppSettings.class, "default_phone_app", R.string.default_phone_title,
		R.string.configure_apps));
		}
		if (DefaultEmergencyPreferenceController.hasEmergencyPreference(mPackageName, context)) {
		screen.addPreference(new ShortcutPreference(getPrefContext(),
		AdvancedAppSettings.class, "default_emergency_app",
		DefaultAppSettings.class, "default_emergency_app",
		R.string.default_emergency_app, R.string.configure_apps));
		}
		if (DefaultSmsPreferenceController.hasSmsPreference(mPackageName, context)) {
		screen.addPreference(new ShortcutPreference(getPrefContext(),
		AdvancedAppSettings.class, "default_sms_app", R.string.sms_application_title,
		DefaultAppSettings.class, "default_sms_app", R.string.sms_application_title,
		R.string.configure_apps));
		}