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

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

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

Change-Id: Ie1e6852a51cdbd9515243fd17582b9b2a9fe440c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wei Sheng Shih
2023-03-06 12:05:04 +00:00
committed by Automerger Merge Worker
parent 4af00db301 cd0a2042ce
commit 614ed8361b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -4492,8 +4492,8 @@ package android.app {
method public void openOptionsMenu(); method public void openOptionsMenu();
method public void overrideActivityTransition(int, @AnimRes int, @AnimRes int); method public void overrideActivityTransition(int, @AnimRes int, @AnimRes int);
method public void overrideActivityTransition(int, @AnimRes int, @AnimRes int, @ColorInt int); method public void overrideActivityTransition(int, @AnimRes int, @AnimRes int, @ColorInt int);
method public void overridePendingTransition(int, int); method @Deprecated public void overridePendingTransition(int, int);
method public void overridePendingTransition(int, int, int); method @Deprecated public void overridePendingTransition(int, int, int);
method public void postponeEnterTransition(); method public void postponeEnterTransition();
method public void recreate(); method public void recreate();
method public void registerActivityLifecycleCallbacks(@NonNull android.app.Application.ActivityLifecycleCallbacks); method public void registerActivityLifecycleCallbacks(@NonNull android.app.Application.ActivityLifecycleCallbacks);

4
core/java/android/app/Activity.java
View File

@@ -6621,7 +6621,9 @@ public class Activity extends ContextThemeWrapper
* the incoming activity. Use 0 for no animation. * the incoming activity. Use 0 for no animation.
* @param exitAnim A resource ID of the animation resource to use for * @param exitAnim A resource ID of the animation resource to use for
* the outgoing activity. Use 0 for no animation. * the outgoing activity. Use 0 for no animation.
* @deprecated Use {@link #overrideActivityTransition(int, int, int)}} instead.
*/ */
@Deprecated
public void overridePendingTransition(int enterAnim, int exitAnim) { public void overridePendingTransition(int enterAnim, int exitAnim) {
overridePendingTransition(enterAnim, exitAnim, 0); overridePendingTransition(enterAnim, exitAnim, 0);
} }
@@ -6644,7 +6646,9 @@ public class Activity extends ContextThemeWrapper
* the outgoing activity. Use 0 for no animation. * the outgoing activity. Use 0 for no animation.
* @param backgroundColor The background color to use for the background during the animation if * @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. * 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) { public void overridePendingTransition(int enterAnim, int exitAnim, int backgroundColor) {
ActivityClient.getInstance().overridePendingTransition(mToken, getPackageName(), enterAnim, ActivityClient.getInstance().overridePendingTransition(mToken, getPackageName(), enterAnim,
exitAnim, backgroundColor); exitAnim, backgroundColor);