Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wei Sheng Shih
2021-06-24 10:47:13 +00:00
committed by Android (Google) Code Review
parent f137ba9818 0797c86219
commit f2d2fb5292
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/window/SplashScreenView.java
View File

@@ -292,6 +292,7 @@ public final class SplashScreenView extends FrameLayout {
private SurfaceView createSurfaceView(@NonNull SplashScreenView view) { private SurfaceView createSurfaceView(@NonNull SplashScreenView view) {
final SurfaceView surfaceView = new SurfaceView(view.getContext()); final SurfaceView surfaceView = new SurfaceView(view.getContext());
surfaceView.setPadding(0, 0, 0, 0);
if (mSurfacePackage == null) { if (mSurfacePackage == null) {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, Log.d(TAG,

5
core/res/res/layout/splash_screen_view.xml
View File

@@ -18,12 +18,15 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:padding="0dp"
android:orientation="vertical"> android:orientation="vertical">
<View android:id="@+id/splashscreen_icon_view" <View android:id="@+id/splashscreen_icon_view"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:padding="0dp"
android:background="@null"
android:contentDescription="@string/splash_screen_view_icon_description"/> android:contentDescription="@string/splash_screen_view_icon_description"/>
<View android:id="@+id/splashscreen_branding_view" <View android:id="@+id/splashscreen_branding_view"
@@ -31,6 +34,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_horizontal|bottom"
android:layout_marginBottom="60dp" android:layout_marginBottom="60dp"
android:padding="0dp"
android:background="@null"
android:contentDescription="@string/splash_screen_view_branding_description"/> android:contentDescription="@string/splash_screen_view_branding_description"/>
</android.window.SplashScreenView> </android.window.SplashScreenView>

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

@@ -288,6 +288,7 @@ public class StartingSurfaceDrawer {
// create splash screen view finished. // create splash screen view finished.
final SplashScreenViewSupplier viewSupplier = new SplashScreenViewSupplier(); final SplashScreenViewSupplier viewSupplier = new SplashScreenViewSupplier();
final FrameLayout rootLayout = new FrameLayout(context); final FrameLayout rootLayout = new FrameLayout(context);
rootLayout.setPadding(0, 0, 0, 0);
final Runnable setViewSynchronized = () -> { final Runnable setViewSynchronized = () -> {
Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "addSplashScreenView"); Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "addSplashScreenView");
// waiting for setContentView before relayoutWindow // waiting for setContentView before relayoutWindow