From db6ba3ba588ea691152a6f46e8a0ed157e34d7b2 Mon Sep 17 00:00:00 2001 From: wilsonshih Date: Mon, 21 Feb 2022 13:52:43 +0800 Subject: Rename 'EMPTY' to 'SOLID_COLOR' for splash screen style. Preventing from misleading developers. Bug: 217953215 Test: atest SplashscreenTests StartingSurfaceDrawerTests ActivityRecordTests Change-Id: I8669effb2e843ebe61e807850359b07b36b39fb3 --- core/java/android/window/SplashScreenView.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/java/android/window/SplashScreenView.java') diff --git a/core/java/android/window/SplashScreenView.java b/core/java/android/window/SplashScreenView.java index 232248b6fab3..10d7ecab4ffa 100644 --- a/core/java/android/window/SplashScreenView.java +++ b/core/java/android/window/SplashScreenView.java @@ -152,7 +152,7 @@ public final class SplashScreenView extends FrameLayout { private Instant mIconAnimationStart; private Duration mIconAnimationDuration; private Consumer mUiThreadInitTask; - private boolean mAllowHandleEmpty = true; + private boolean mAllowHandleSolidColor = true; public Builder(@NonNull Context context) { mContext = context; @@ -263,8 +263,8 @@ public final class SplashScreenView extends FrameLayout { * Sets whether this view can be copied and transferred to the client if the view is * empty style splash screen. */ - public Builder setAllowHandleEmpty(boolean allowHandleEmpty) { - mAllowHandleEmpty = allowHandleEmpty; + public Builder setAllowHandleSolidColor(boolean allowHandleSolidColor) { + mAllowHandleSolidColor = allowHandleSolidColor; return this; } @@ -314,7 +314,7 @@ public final class SplashScreenView extends FrameLayout { } view.mIconView = imageView; } - if (mOverlayDrawable != null || (view.mIconView == null && !mAllowHandleEmpty)) { + if (mOverlayDrawable != null || (view.mIconView == null && !mAllowHandleSolidColor)) { view.setNotCopyable(); } -- cgit v1.2.3