summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author wilsonshih <wilsonshih@google.com> 2022-04-25 11:44:30 +0800
committer wilsonshih <wilsonshih@google.com> 2022-04-25 11:44:30 +0800
commit90cf76a2408793fb77c676b7a5430c293a87ecab (patch)
treefa0ed87583f027e0d19c10a65c9a6ac5546d1b73
parent99b30edb9ecd1c70086792928215f5d3a97666e2 (diff)
Ensure the splash screen launched from system ui must be solid color.
Core may lose the launch source when launch with pending intent. Bug: 215262680 Bug: 204414989 Test: verify always shows solid color splash screen when lauch activity from system ui. Change-Id: I187574ecaeadc73d856256cfeebe214c8b76e841
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java
index 5e81b5da2455..f3510949ae0a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java
@@ -110,6 +110,7 @@ import android.view.WindowManager;
import android.view.WindowManagerGlobal;
import android.view.accessibility.AccessibilityManager;
import android.widget.DateTimeView;
+import android.window.SplashScreen;
import androidx.annotation.NonNull;
import androidx.lifecycle.Lifecycle;
@@ -4096,6 +4097,7 @@ public class CentralSurfaces extends CoreStartable implements
} else {
options = ActivityOptions.makeBasic();
}
+ options.setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR);
return options;
}