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

Browse Source
This commit is contained in:
Wei Sheng Shih
2023-03-06 11:45:46 +00:00
committed by Android (Google) Code Review
parent f517f9dcff f3c4cf0b18
commit cd0a2042ce
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 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);

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.
* @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);