Merge "Ensure the splash screen launched from system ui must be solid color." into tm-dev am: 02e7e43950

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17938063

Change-Id: I950e35e19a61e936c7a73b335d4b99c34155172f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wei Sheng Shih
2022-04-26 03:08:21 +00:00
committed by Automerger Merge Worker

View File

@@ -110,6 +110,7 @@ import android.view.WindowManager;
import android.view.WindowManagerGlobal; import android.view.WindowManagerGlobal;
import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager;
import android.widget.DateTimeView; import android.widget.DateTimeView;
import android.window.SplashScreen;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Lifecycle;
@@ -4099,6 +4100,7 @@ public class CentralSurfaces extends CoreStartable implements
} else { } else {
options = ActivityOptions.makeBasic(); options = ActivityOptions.makeBasic();
} }
options.setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR);
return options; return options;
} }