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

Merge "Apply the mask to all splashscreen forground icons" into sc-dev

Browse Source
This commit is contained in:
Vadim Caen
2021-06-29 16:52:57 +00:00
committed by Android (Google) Code Review
parent 0954cfe651 b83f4423f8
commit 4f25b8822e
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashScreenExitAnimation.java
View File

@@ -85,7 +85,10 @@ public class SplashScreenExitAnimation implements Animator.AnimatorListener {
} }
View iconView = view.getIconView(); View iconView = view.getIconView();
if (iconView == null || iconView.getBackground() == null) {
// If the icon and the background are invisible, don't animate it
if (iconView == null || iconView.getLayoutParams().width == 0
|| iconView.getLayoutParams().height == 0) {
mIconFadeOutDuration = 0; mIconFadeOutDuration = 0;
mIconStartAlpha = 0; mIconStartAlpha = 0;
mAppRevealDelay = 0; mAppRevealDelay = 0;

22
libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java
View File

@@ -77,6 +77,13 @@ public class SplashscreenContentDrawer {
// For example, an icon with the foreground 108*108 opaque pixels and it's background // For example, an icon with the foreground 108*108 opaque pixels and it's background
// also 108*108 pixels, then do not enlarge this icon if only need to show foreground icon. // also 108*108 pixels, then do not enlarge this icon if only need to show foreground icon.
private static final float ENLARGE_FOREGROUND_ICON_THRESHOLD = (72f * 72f) / (108f * 108f); private static final float ENLARGE_FOREGROUND_ICON_THRESHOLD = (72f * 72f) / (108f * 108f);
/**
* If the developer doesn't specify a background for the icon, we slightly scale it up.
*
* The background is either manually specified in the theme or the Adaptive Icon
* background is used if it's different from the window background.
*/
private static final float NO_BACKGROUND_SCALE = 192f / 160; private static final float NO_BACKGROUND_SCALE = 192f / 160;
private final Context mContext; private final Context mContext;
private final IconProvider mIconProvider; private final IconProvider mIconProvider;
@@ -228,7 +235,7 @@ public class SplashscreenContentDrawer {
attrs.mWindowBgColor = safeReturnAttrDefault((def) -> typedArray.getColor( attrs.mWindowBgColor = safeReturnAttrDefault((def) -> typedArray.getColor(
R.styleable.Window_windowSplashScreenBackground, def), R.styleable.Window_windowSplashScreenBackground, def),
Color.TRANSPARENT); Color.TRANSPARENT);
attrs.mReplaceIcon = safeReturnAttrDefault((def) -> typedArray.getDrawable( attrs.mSplashScreenIcon = safeReturnAttrDefault((def) -> typedArray.getDrawable(
R.styleable.Window_windowSplashScreenAnimatedIcon), null); R.styleable.Window_windowSplashScreenAnimatedIcon), null);
attrs.mAnimationDuration = safeReturnAttrDefault((def) -> typedArray.getInt( attrs.mAnimationDuration = safeReturnAttrDefault((def) -> typedArray.getInt(
R.styleable.Window_windowSplashScreenAnimationDuration, def), 0); R.styleable.Window_windowSplashScreenAnimationDuration, def), 0);
@@ -241,7 +248,7 @@ public class SplashscreenContentDrawer {
if (DEBUG) { if (DEBUG) {
Slog.d(TAG, "window attributes color: " Slog.d(TAG, "window attributes color: "
+ Integer.toHexString(attrs.mWindowBgColor) + Integer.toHexString(attrs.mWindowBgColor)
+ " icon " + attrs.mReplaceIcon + " duration " + attrs.mAnimationDuration + " icon " + attrs.mSplashScreenIcon + " duration " + attrs.mAnimationDuration
+ " brandImage " + attrs.mBrandingImage); + " brandImage " + attrs.mBrandingImage);
} }
} }
@@ -250,7 +257,7 @@ public class SplashscreenContentDrawer {
public static class SplashScreenWindowAttrs { public static class SplashScreenWindowAttrs {
private int mWindowBgResId = 0; private int mWindowBgResId = 0;
private int mWindowBgColor = Color.TRANSPARENT; private int mWindowBgColor = Color.TRANSPARENT;
private Drawable mReplaceIcon = null; private Drawable mSplashScreenIcon = null;
private Drawable mBrandingImage = null; private Drawable mBrandingImage = null;
private int mIconBgColor = Color.TRANSPARENT; private int mIconBgColor = Color.TRANSPARENT;
private int mAnimationDuration = 0; private int mAnimationDuration = 0;
@@ -287,10 +294,15 @@ public class SplashscreenContentDrawer {
// empty splash screen case // empty splash screen case
animationDuration = 0; animationDuration = 0;
mFinalIconSize = 0; mFinalIconSize = 0;
} else if (mTmpAttrs.mReplaceIcon != null) { } else if (mTmpAttrs.mSplashScreenIcon != null) {
// replaced icon, don't process // replaced icon, don't process
iconDrawable = mTmpAttrs.mReplaceIcon; iconDrawable = mTmpAttrs.mSplashScreenIcon;
animationDuration = mTmpAttrs.mAnimationDuration; animationDuration = mTmpAttrs.mAnimationDuration;
// There is no background below the icon, so scale the icon up
if (mTmpAttrs.mIconBgColor == Color.TRANSPARENT) {
mFinalIconSize *= NO_BACKGROUND_SCALE;
}
createIconDrawable(iconDrawable, false); createIconDrawable(iconDrawable, false);
} else { } else {
final float iconScale = (float) mIconSize / (float) mDefaultIconSize; final float iconScale = (float) mIconSize / (float) mDefaultIconSize;

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

@@ -162,6 +162,7 @@ public class SplashscreenIconDrawableFactory {
@Override @Override
public void draw(Canvas canvas) { public void draw(Canvas canvas) {
canvas.clipPath(mMaskScaleOnly);
if (mMaskScaleOnly != null) { if (mMaskScaleOnly != null) {
canvas.drawPath(mMaskScaleOnly, mPaint); canvas.drawPath(mMaskScaleOnly, mPaint);
} }