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

Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev

Browse Source
This commit is contained in:
Vladislav Kaznacheev
2016-05-05 23:04:46 +00:00
committed by Android (Google) Code Review
parent c5be8f8a4b acf147e7e3
commit 7d2a0a0571
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/test-current.txt
View File

@@ -3867,6 +3867,7 @@ package android.app {
method public static android.app.ActivityOptions makeThumbnailScaleUpAnimation(android.view.View, android.graphics.Bitmap, int, int); method public static android.app.ActivityOptions makeThumbnailScaleUpAnimation(android.view.View, android.graphics.Bitmap, int, int);
method public void requestUsageTimeReport(android.app.PendingIntent); method public void requestUsageTimeReport(android.app.PendingIntent);
method public android.app.ActivityOptions setLaunchBounds(android.graphics.Rect); method public android.app.ActivityOptions setLaunchBounds(android.graphics.Rect);
method public void setLaunchStackId(int);
method public android.os.Bundle toBundle(); method public android.os.Bundle toBundle();
method public void update(android.app.ActivityOptions); method public void update(android.app.ActivityOptions);
field public static final java.lang.String EXTRA_USAGE_TIME_REPORT = "android.activity.usage_time"; field public static final java.lang.String EXTRA_USAGE_TIME_REPORT = "android.activity.usage_time";

2
core/java/android/app/ActivityOptions.java
View File

@@ -20,6 +20,7 @@ import static android.app.ActivityManager.DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT;
import static android.app.ActivityManager.StackId.INVALID_STACK_ID; import static android.app.ActivityManager.StackId.INVALID_STACK_ID;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.TestApi;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;
@@ -939,6 +940,7 @@ public class ActivityOptions {
} }
/** @hide */ /** @hide */
@TestApi
public void setLaunchStackId(int launchStackId) { public void setLaunchStackId(int launchStackId) {
mLaunchStackId = launchStackId; mLaunchStackId = launchStackId;
} }