Merge "Add default for music and gallery app." (2148e7f0) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -239,6 +239,8 @@ package android {
		field public static final int config_defaultAssistant = 17039393; // 0x1040021
		field public static final int config_defaultBrowser = 17039394; // 0x1040022
		field public static final int config_defaultDialer = 17039395; // 0x1040023
		field public static final int config_defaultGallery = 17039398; // 0x1040026
		field public static final int config_defaultMusic = 17039397; // 0x1040025
		field public static final int config_defaultSms = 17039396; // 0x1040024
		field public static final int config_feedbackIntentExtraKey = 17039391; // 0x104001f
		field public static final int config_feedbackIntentNameKey = 17039392; // 0x1040020

core/java/android/app/role/RoleManager.java

+25 −25

Original line number	Diff line number	Diff line
		@@ -68,6 +68,22 @@ public final class RoleManager {

		private static final String LOG_TAG = RoleManager.class.getSimpleName();

		/**
		* The name of the assistant app role.
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String ROLE_ASSISTANT = "android.app.role.ASSISTANT";

		/**
		* The name of the browser role.
		*
		* @see Intent#CATEGORY_APP_BROWSER
		*/
		public static final String ROLE_BROWSER = "android.app.role.BROWSER";

		/**
		* The name of the dialer role.
		*
		@@ -83,18 +99,18 @@ public final class RoleManager {
		public static final String ROLE_SMS = "android.app.role.SMS";

		/**
		* The name of the browser role.
		* The name of the emergency role
		*
		* @see Intent#CATEGORY_APP_BROWSER
		* @see android.telephony.TelephonyManager#ACTION_EMERGENCY_ASSISTANCE
		*/
		public static final String ROLE_BROWSER = "android.app.role.BROWSER";
		public static final String ROLE_EMERGENCY = "android.app.role.EMERGENCY";

		/**
		* The name of the gallery role.
		* The name of the home role.
		*
		* @see Intent#CATEGORY_APP_GALLERY
		* @see Intent#CATEGORY_HOME
		*/
		public static final String ROLE_GALLERY = "android.app.role.GALLERY";
		public static final String ROLE_HOME = "android.app.role.HOME";

		/**
		* The name of the music player role.
		@@ -104,18 +120,11 @@ public final class RoleManager {
		public static final String ROLE_MUSIC = "android.app.role.MUSIC";

		/**
		* The name of the home role.
		*
		* @see Intent#CATEGORY_HOME
		*/
		public static final String ROLE_HOME = "android.app.role.HOME";

		/**
		* The name of the emergency role
		* The name of the gallery role.
		*
		* @see android.telephony.TelephonyManager#ACTION_EMERGENCY_ASSISTANCE
		* @see Intent#CATEGORY_APP_GALLERY
		*/
		public static final String ROLE_EMERGENCY = "android.app.role.EMERGENCY";
		public static final String ROLE_GALLERY = "android.app.role.GALLERY";

		/**
		* The name of the car mode dialer app role.
		@@ -172,15 +181,6 @@ public final class RoleManager {
		*/
		public static final String ROLE_CALL_COMPANION = "android.app.role.CALL_COMPANION";

		/**
		* The name of the assistant app role.
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String ROLE_ASSISTANT = "android.app.role.ASSISTANT";

		/**
		* @hide
		*/

core/res/res/values/config.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -1951,6 +1951,10 @@
		<string name="config_defaultDialer" translatable="false">com.android.phone</string>
		<!-- The name of the package that will hold the SMS role by default. -->
		<string name="config_defaultSms" translatable="false">@string/default_sms_application</string>
		<!-- The name of the package that will hold the music role by default. -->
		<string name="config_defaultMusic" translatable="false">com.android.music</string>
		<!-- The name of the package that will hold the gallery role by default. -->
		<string name="config_defaultGallery" translatable="false">com.android.gallery3d</string>

		<!-- Enable/disable default bluetooth profiles:
		HSP_AG, ObexObjectPush, Audio, NAP -->

core/res/res/values/public.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -2979,6 +2979,10 @@
		<public name="config_defaultDialer" />
		<!-- @hide @SystemApi -->
		<public name="config_defaultSms" />
		<!-- @hide @SystemApi -->
		<public name="config_defaultMusic" />
		<!-- @hide @SystemApi -->
		<public name="config_defaultGallery" />
		</public-group>

		<public-group type="bool" first-id="0x01110000">