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

Commit 614ed836 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Deprecate overridePendingTransition for U." into udc-dev am: cd0a2042 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21535744



Change-Id: Ie1e6852a51cdbd9515243fd17582b9b2a9fe440c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4af00db3 cd0a2042

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