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

Commit 761e58ee authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Make getSplashScreenStyle public."

parents fc1567fb 64d96eba

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4534,6 +4534,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);

core/java/android/app/ActivityOptions.java

+0 −1
Original line number Diff line number Diff line
@@ -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;