diff options
| author | 2023-03-06 11:45:46 +0000 | |
|---|---|---|
| committer | 2023-03-06 11:45:46 +0000 | |
| commit | cd0a2042cef07d0569b83b146a18099beeaa5be7 (patch) | |
| tree | 3198d5c1d32a0d707efaeb070161915586ada7f0 | |
| parent | f517f9dcfff381a91648e74c73712fb32a859e00 (diff) | |
| parent | f3c4cf0b18e2f097726ebafe8ec9fa9e1f5a613f (diff) | |
Merge "Deprecate overridePendingTransition for U." into udc-dev
| -rw-r--r-- | core/api/current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/app/Activity.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 259f1e9d4c53..f625a73f222d 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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); diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index d9c7a27cb95e..125e7270b0e2 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -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); |