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

Commit cd0a2042 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Deprecate overridePendingTransition for U." into udc-dev

parents f517f9dc f3c4cf0b

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -4492,8 +4492,8 @@ package android.app { 
    method public void openOptionsMenu();

    method public void overrideActivityTransition(int, @AnimRes int, @AnimRes int);

    method public void overrideActivityTransition(int, @AnimRes int, @AnimRes int, @ColorInt int);

    method public void overridePendingTransition(int, int);

    method public void overridePendingTransition(int, int, int);

    method @Deprecated public void overridePendingTransition(int, int);

    method @Deprecated public void overridePendingTransition(int, int, int);

    method public void postponeEnterTransition();

    method public void recreate();

    method public void registerActivityLifecycleCallbacks(@NonNull android.app.Application.ActivityLifecycleCallbacks);

core/java/android/app/Activity.java

+4 −0
Original line number Diff line number Diff line
@@ -6621,7 +6621,9 @@ public class Activity extends ContextThemeWrapper 
     * the incoming activity.  Use 0 for no animation.

     * @param exitAnim A resource ID of the animation resource to use for

     * the outgoing activity.  Use 0 for no animation.

     * @deprecated Use {@link #overrideActivityTransition(int, int, int)}} instead.

     */

    @Deprecated

    public void overridePendingTransition(int enterAnim, int exitAnim) {

        overridePendingTransition(enterAnim, exitAnim, 0);

    }
@@ -6644,7 +6646,9 @@ public class Activity extends ContextThemeWrapper 
     * the outgoing activity.  Use 0 for no animation.

     * @param backgroundColor The background color to use for the background during the animation if

     * the animation requires a background. Set to 0 to not override the default color.

     * @deprecated Use {@link #overrideActivityTransition(int, int, int, int)}} instead.

     */

    @Deprecated

    public void overridePendingTransition(int enterAnim, int exitAnim, int backgroundColor) {

        ActivityClient.getInstance().overridePendingTransition(mToken, getPackageName(), enterAnim,

                exitAnim, backgroundColor);