Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Respond to API council feedback." into oc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2017-04-28 22:54:34 +00:00
committed by Android (Google) Code Review
parent f7e6f581c0 1a74942fbf
commit d275dc83be
7 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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";
}

2
api/system-current.txt
View File

@@ -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";
}

2
api/test-current.txt
View File

@@ -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";
}

8
core/java/android/content/Intent.java
View File

@@ -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>

18
core/java/android/service/quicksettings/TileService.java
View File

@@ -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);
}

2
packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java vendored
View File

@@ -240,7 +240,7 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener
i.setPackage(mComponent.getPackageName());
i = resolveIntent(i);
if (i != null) {
i.putExtra(TileService.EXTRA_COMPONENT, mComponent);
i.putExtra(Intent.EXTRA_COMPONENT_NAME, mComponent);
i.putExtra(TileService.EXTRA_STATE, mTile.getState());
return i;
}

2
packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java vendored
View File

@@ -313,7 +313,7 @@ public class TileServices extends IQSService.Stub {
public void onReceive(Context context, Intent intent) {
if (TileService.ACTION_REQUEST_LISTENING.equals(intent.getAction())) {
requestListening(
(ComponentName) intent.getParcelableExtra(TileService.EXTRA_COMPONENT));
(ComponentName) intent.getParcelableExtra(Intent.EXTRA_COMPONENT_NAME));
}
}
};