diff options
| author | Wei Sheng Shih <wilsonshih@google.com> | 2021-12-08 04:01:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-08 04:01:07 +0000 |
| commit | 356f80679e1374107b2dbed264156472078b8a13 (patch) | |
| tree | fcd0addb13deab212cbb66c36a137f78f84cab4b /core/java | |
| parent | c446353f1c70d0ef6f41a21a36fb40da1d23569d (diff) | |
| parent | 611d320a399330a2136e89ce486192b78df633af (diff) | |
Merge "Provide default splash screen style for Launcher and SystemUI." into sc-v2-dev am: 611d320a39
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16338744
Change-Id: I238f0b674486f75dce539047b671c0e827289168
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/ActivityOptions.java | 2 | ||||
| -rw-r--r-- | core/java/android/window/SplashScreen.java | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index edcab29dec94..0ff9f6655b8a 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -431,7 +431,7 @@ public class ActivityOptions { private boolean mOverrideTaskTransition; private String mSplashScreenThemeResName; @SplashScreen.SplashScreenStyle - private int mSplashScreenStyle; + private int mSplashScreenStyle = SplashScreen.SPLASH_SCREEN_STYLE_UNDEFINED; private boolean mRemoveWithTaskOrganizer; private boolean mLaunchedFromBubble; private boolean mTransientLaunch; diff --git a/core/java/android/window/SplashScreen.java b/core/java/android/window/SplashScreen.java index b9bf009fb2bb..090dbff488e9 100644 --- a/core/java/android/window/SplashScreen.java +++ b/core/java/android/window/SplashScreen.java @@ -43,6 +43,11 @@ import java.util.ArrayList; */ public interface SplashScreen { /** + * The splash screen style is not defined. + * @hide + */ + int SPLASH_SCREEN_STYLE_UNDEFINED = -1; + /** * Force splash screen to be empty. * @hide */ @@ -55,6 +60,7 @@ public interface SplashScreen { /** @hide */ @IntDef(prefix = { "SPLASH_SCREEN_STYLE_" }, value = { + SPLASH_SCREEN_STYLE_UNDEFINED, SPLASH_SCREEN_STYLE_EMPTY, SPLASH_SCREEN_STYLE_ICON }) |