From 64d96eba959a3838883982ec69f2b160648a1077 Mon Sep 17 00:00:00 2001 From: wilsonshih Date: Tue, 8 Feb 2022 13:26:29 +0800 Subject: [PATCH] Make getSplashScreenStyle public. Bug: 217953215 Test: atest ActivityOptionsTest#testActivityOptionsBundle_fromBundle Change-Id: I16c5ffbbbc2c40a6216b4338943ae45fadc92f76 --- core/api/current.txt | 1 + core/java/android/app/ActivityOptions.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/core/api/current.txt b/core/api/current.txt index 48ab51d6e8a69..757f2e324bcda 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -4503,6 +4503,7 @@ package android.app { method @Nullable public android.graphics.Rect getLaunchBounds(); method public int getLaunchDisplayId(); method public boolean getLockTaskMode(); + method public int getSplashScreenStyle(); method public boolean isPendingIntentBackgroundActivityLaunchAllowed(); method public static android.app.ActivityOptions makeBasic(); method public static android.app.ActivityOptions makeClipRevealAnimation(android.view.View, int, int, int, int); diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index e405b60c8daaf..acbcb3ea89b54 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -1429,7 +1429,6 @@ public class ActivityOptions extends ComponentOptions { /** * Gets the style can be used for cold-launching an activity. * @see #setSplashScreenStyle(int) - * @hide */ public @SplashScreen.SplashScreenStyle int getSplashScreenStyle() { return mSplashScreenStyle;