drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue #6426645: API REVIEW: android.app.ActivityOptions" into jb-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2012-05-04 16:10:16 -07:00
committed by Android (Google) Code Review
parent c9c23196a1 ddc52a80b5
commit 6ad5b4f637
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@ -2927,11 +2927,11 @@ package android.app {
} }
public class ActivityOptions { public class ActivityOptions {
method public void join(android.app.ActivityOptions);
method public static android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int); method public static android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int);
method public static android.app.ActivityOptions makeScaleUpAnimation(android.view.View, int, int, int, int); method public static android.app.ActivityOptions makeScaleUpAnimation(android.view.View, int, int, int, int);
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 android.os.Bundle toBundle(); method public android.os.Bundle toBundle();
method public void update(android.app.ActivityOptions);
} }
public class AlarmManager { public class AlarmManager {

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

@ -325,10 +325,11 @@ public class ActivityOptions {
} }
/** /**
* Join the values in <var>otherOptions</var> in to this one. Any values * Update the current values in this ActivityOptions from those supplied
* in <var>otherOptions</var>. Any values
* defined in <var>otherOptions</var> replace those in the base options. * defined in <var>otherOptions</var> replace those in the base options.
*/ */
public void join(ActivityOptions otherOptions) { public void update(ActivityOptions otherOptions) {
if (otherOptions.mPackageName != null) { if (otherOptions.mPackageName != null) {
mPackageName = otherOptions.mPackageName; mPackageName = otherOptions.mPackageName;
} }