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

Commit 4492457a authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Preventing global config change from windowless starting window." into main

parents 78974171 e49472e3

libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/WindowlessSnapshotWindowCreator.java

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ class WindowlessSnapshotWindowCreator { 
        final Display display = mDisplayManager.getDisplay(runningTaskInfo.displayId);

        final StartingSurfaceDrawer.WindowlessStartingWindow wlw =

                new StartingSurfaceDrawer.WindowlessStartingWindow(

                runningTaskInfo.configuration, rootSurface);

                        mContext.getResources().getConfiguration(), rootSurface);

        final SurfaceControlViewHost mViewHost = new SurfaceControlViewHost(

                mContext, display, wlw, "WindowlessSnapshotWindowCreator");

        final Rect windowBounds = runningTaskInfo.configuration.windowConfiguration.getBounds();

libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/WindowlessSplashWindowCreator.java

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ class WindowlessSplashWindowCreator extends AbsSplashWindowCreator { 
        }

        final StartingSurfaceDrawer.WindowlessStartingWindow wlw =

                new StartingSurfaceDrawer.WindowlessStartingWindow(

                        taskInfo.configuration, rootSurface);

                        mContext.getResources().getConfiguration(), rootSurface);

        final SurfaceControlViewHost viewHost = new SurfaceControlViewHost(

                myContext, display, wlw, "WindowlessSplashWindowCreator");

        final String title = "Windowless Splash " + taskInfo.taskId;
@@ -95,7 +95,7 @@ class WindowlessSplashWindowCreator extends AbsSplashWindowCreator { 
        }



        final FrameLayout rootLayout = new FrameLayout(

                mSplashscreenContentDrawer.createViewContextWrapper(mContext));

                mSplashscreenContentDrawer.createViewContextWrapper(myContext));

        viewHost.setView(rootLayout, lp);



        final int bgColor = taskDescription.getBackgroundColor();