Merge "Make getSplashScreenStyle public."
This commit is contained in:
committed by
Android (Google) Code Review
commit
761e58ee17
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user