Merge "Respond to API council feedback." into oc-dev (d275dc83) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -9496,6 +9496,7 @@ package android.content {
		field public static final java.lang.String EXTRA_CHOOSER_TARGETS = "android.intent.extra.CHOOSER_TARGETS";
		field public static final java.lang.String EXTRA_CHOSEN_COMPONENT = "android.intent.extra.CHOSEN_COMPONENT";
		field public static final java.lang.String EXTRA_CHOSEN_COMPONENT_INTENT_SENDER = "android.intent.extra.CHOSEN_COMPONENT_INTENT_SENDER";
		field public static final java.lang.String EXTRA_COMPONENT_NAME = "android.intent.extra.COMPONENT_NAME";
		field public static final java.lang.String EXTRA_CONTENT_ANNOTATIONS = "android.intent.extra.CONTENT_ANNOTATIONS";
		field public static final java.lang.String EXTRA_DATA_REMOVED = "android.intent.extra.DATA_REMOVED";
		field public static final java.lang.String EXTRA_DOCK_STATE = "android.intent.extra.DOCK_STATE";
		@@ -37478,7 +37479,6 @@ package android.service.quicksettings {
		method public final void unlockAndRun(java.lang.Runnable);
		field public static final java.lang.String ACTION_QS_TILE = "android.service.quicksettings.action.QS_TILE";
		field public static final java.lang.String ACTION_QS_TILE_PREFERENCES = "android.service.quicksettings.action.QS_TILE_PREFERENCES";
		field public static final java.lang.String EXTRA_COMPONENT = "android.service.quicksettings.extra.COMPONENT";
		field public static final java.lang.String META_DATA_ACTIVE_TILE = "android.service.quicksettings.ACTIVE_TILE";
		}

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -10046,6 +10046,7 @@ package android.content {
		field public static final java.lang.String EXTRA_CHOOSER_TARGETS = "android.intent.extra.CHOOSER_TARGETS";
		field public static final java.lang.String EXTRA_CHOSEN_COMPONENT = "android.intent.extra.CHOSEN_COMPONENT";
		field public static final java.lang.String EXTRA_CHOSEN_COMPONENT_INTENT_SENDER = "android.intent.extra.CHOSEN_COMPONENT_INTENT_SENDER";
		field public static final java.lang.String EXTRA_COMPONENT_NAME = "android.intent.extra.COMPONENT_NAME";
		field public static final java.lang.String EXTRA_CONTENT_ANNOTATIONS = "android.intent.extra.CONTENT_ANNOTATIONS";
		field public static final deprecated java.lang.String EXTRA_CSS_INDICATOR = "cssIndicator";
		field public static final deprecated java.lang.String EXTRA_DATA_OPERATOR_ALPHA_LONG = "data-operator-alpha-long";
		@@ -40680,7 +40681,6 @@ package android.service.quicksettings {
		method public final void unlockAndRun(java.lang.Runnable);
		field public static final java.lang.String ACTION_QS_TILE = "android.service.quicksettings.action.QS_TILE";
		field public static final java.lang.String ACTION_QS_TILE_PREFERENCES = "android.service.quicksettings.action.QS_TILE_PREFERENCES";
		field public static final java.lang.String EXTRA_COMPONENT = "android.service.quicksettings.extra.COMPONENT";
		field public static final java.lang.String META_DATA_ACTIVE_TILE = "android.service.quicksettings.ACTIVE_TILE";
		}

api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -9530,6 +9530,7 @@ package android.content {
		field public static final java.lang.String EXTRA_CHOOSER_TARGETS = "android.intent.extra.CHOOSER_TARGETS";
		field public static final java.lang.String EXTRA_CHOSEN_COMPONENT = "android.intent.extra.CHOSEN_COMPONENT";
		field public static final java.lang.String EXTRA_CHOSEN_COMPONENT_INTENT_SENDER = "android.intent.extra.CHOSEN_COMPONENT_INTENT_SENDER";
		field public static final java.lang.String EXTRA_COMPONENT_NAME = "android.intent.extra.COMPONENT_NAME";
		field public static final java.lang.String EXTRA_CONTENT_ANNOTATIONS = "android.intent.extra.CONTENT_ANNOTATIONS";
		field public static final java.lang.String EXTRA_DATA_REMOVED = "android.intent.extra.DATA_REMOVED";
		field public static final java.lang.String EXTRA_DOCK_STATE = "android.intent.extra.DOCK_STATE";
		@@ -37673,7 +37674,6 @@ package android.service.quicksettings {
		method public final void unlockAndRun(java.lang.Runnable);
		field public static final java.lang.String ACTION_QS_TILE = "android.service.quicksettings.action.QS_TILE";
		field public static final java.lang.String ACTION_QS_TILE_PREFERENCES = "android.service.quicksettings.action.QS_TILE_PREFERENCES";
		field public static final java.lang.String EXTRA_COMPONENT = "android.service.quicksettings.extra.COMPONENT";
		field public static final java.lang.String META_DATA_ACTIVE_TILE = "android.service.quicksettings.ACTIVE_TILE";
		}

core/java/android/content/Intent.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -1839,6 +1839,14 @@ public class Intent implements Parcelable, Cloneable {
		@SystemApi
		public static final String EXTRA_SPLIT_NAME = "android.intent.extra.SPLIT_NAME";

		/**
		* Intent extra: A {@link ComponentName} value.
		* <p>
		* Type: String
		* </p>
		*/
		public static final String EXTRA_COMPONENT_NAME = "android.intent.extra.COMPONENT_NAME";

		/**
		* Intent extra: An extra for specifying whether a result is needed.
		* <p>

core/java/android/service/quicksettings/TileService.java

+8 −10

Original line number	Diff line number	Diff line
		@@ -80,8 +80,13 @@ import com.android.internal.R;
		public class TileService extends Service {

		/**
		* An activity that provides a user interface for adjusting TileService preferences.
		* Optional but recommended for apps that implement a TileService.
		* An activity that provides a user interface for adjusting TileService
		* preferences. Optional but recommended for apps that implement a
		* TileService.
		* <p>
		* This intent may also define a {@link Intent#EXTRA_COMPONENT_NAME} value
		* to indicate the {@link ComponentName} that caused the preferences to be
		* opened.
		*/
		@SdkConstant(SdkConstantType.INTENT_CATEGORY)
		public static final String ACTION_QS_TILE_PREFERENCES
		@@ -129,13 +134,6 @@ public class TileService extends Service {
		*/
		public static final String EXTRA_TOKEN = "token";

		/**
		* May be included when {@link #ACTION_QS_TILE_PREFERENCES} is launched from a tile.
		* This extra may contain the {@link ComponentName} of the tile that triggered
		* the preferences to be opened.
		*/
		public static final String EXTRA_COMPONENT = "android.service.quicksettings.extra.COMPONENT";

		/**
		* @hide
		*/
		@@ -445,7 +443,7 @@ public class TileService extends Service {
		*/
		public static final void requestListeningState(Context context, ComponentName component) {
		Intent intent = new Intent(ACTION_REQUEST_LISTENING);
		intent.putExtra(EXTRA_COMPONENT, component);
		intent.putExtra(Intent.EXTRA_COMPONENT_NAME, component);
		intent.setPackage("com.android.systemui");
		context.sendBroadcast(intent, Manifest.permission.BIND_QUICK_SETTINGS_TILE);
		}