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

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

Merge "Clear padding and background after create view from context." into sc-dev

parents f137ba98 0797c862

core/java/android/window/SplashScreenView.java

+1 −0
Original line number Diff line number Diff line
@@ -292,6 +292,7 @@ public final class SplashScreenView extends FrameLayout { 


        private SurfaceView createSurfaceView(@NonNull SplashScreenView view) {

            final SurfaceView surfaceView = new SurfaceView(view.getContext());

            surfaceView.setPadding(0, 0, 0, 0);

            if (mSurfacePackage == null) {

                if (DEBUG) {

                    Log.d(TAG,

core/res/res/layout/splash_screen_view.xml

+5 −0
Original line number Diff line number Diff line
@@ -18,12 +18,15 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_height="match_parent"

    android:layout_width="match_parent"

    android:padding="0dp"

    android:orientation="vertical">



    <View android:id="@+id/splashscreen_icon_view"

          android:layout_height="wrap_content"

          android:layout_width="wrap_content"

          android:layout_gravity="center"

          android:padding="0dp"

          android:background="@null"

          android:contentDescription="@string/splash_screen_view_icon_description"/>



    <View android:id="@+id/splashscreen_branding_view"
@@ -31,6 +34,8 @@ 
          android:layout_width="wrap_content"

          android:layout_gravity="center_horizontal|bottom"

          android:layout_marginBottom="60dp"

          android:padding="0dp"

          android:background="@null"

          android:contentDescription="@string/splash_screen_view_branding_description"/>



</android.window.SplashScreenView>
 
 No newline at end of file

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

+1 −0
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ public class StartingSurfaceDrawer { 
        // create splash screen view finished.

        final SplashScreenViewSupplier viewSupplier = new SplashScreenViewSupplier();

        final FrameLayout rootLayout = new FrameLayout(context);

        rootLayout.setPadding(0, 0, 0, 0);

        final Runnable setViewSynchronized = () -> {

            Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "addSplashScreenView");

            // waiting for setContentView before relayoutWindow