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

Commit 696b21cb authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Ensure the splash screen launched from system ui must be solid color."... 

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

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: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8a7f836c 02e7e439

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java

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

    }

    }