Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ad5b4f6 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

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

parents c9c23196 ddc52a80

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2927,11 +2927,11 @@ package android.app { 
  }















  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 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 android.os.Bundle toBundle();













    method public void update(android.app.ActivityOptions);















  }





























  public class AlarmManager {

























core/java/android/app/ActivityOptions.java



+3
−2




























Original line number
Diff line number
Diff line








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















     */













    public void join(ActivityOptions otherOptions) {













    public void update(ActivityOptions otherOptions) {















        if (otherOptions.mPackageName != null) {















            mPackageName = otherOptions.mPackageName;















        }