Update app icon shadows

Allow use of white shadow, set radius to 1.0 and offset to 0.
Use 100% and 20% alpha, instead of 70% and 50%.
(nets out to same effect)
Make ambient and key shadows equivalent: there are deterministic
formulas for what contrast a shadow will create, and those formulas
were used for the spec. Ad-hoc attempts to try to increase visibility
are no longer needed and don't align with design intent

Bug: 213314628
Test: Manual inspection at runtime
Change-Id: Ie12d3d05488e16fea94e91be16c25448f450a44d
This commit is contained in:
James O'Leary committed 2022-05-12 18:28:39 +00:00
1 parent 384b521dd5
commit fe435ad44e
2 files changed
+18 -27

No files matched your search

@@ -16,8 +16,6 @@
package com.android.launcher3.views;
import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Canvas;
@@ -56,11 +54,10 @@ public class DoubleShadowBubbleTextView extends BubbleTextView {
super.onDraw(canvas);
return;
}
int alpha = Color.alpha(getCurrentTextColor());
// We enhance the shadow by drawing the shadow twice
getPaint().setShadowLayer(mShadowInfo.ambientShadowBlur, 0, 0,
getTextShadowColor(mShadowInfo.ambientShadowColor, alpha));
mShadowInfo.ambientShadowColor);
drawWithoutDot(canvas);
canvas.save();
@@ -72,7 +69,7 @@ public class DoubleShadowBubbleTextView extends BubbleTextView {
mShadowInfo.keyShadowBlur,
mShadowInfo.keyShadowOffsetX,
mShadowInfo.keyShadowOffsetY,
getTextShadowColor(mShadowInfo.keyShadowColor, alpha));
mShadowInfo.keyShadowColor);
drawWithoutDot(canvas);
canvas.restore();
@@ -113,24 +110,18 @@ public class DoubleShadowBubbleTextView extends BubbleTextView {
return true;
} else if (ambientShadowAlpha > 0 && keyShadowAlpha == 0) {
textView.getPaint().setShadowLayer(ambientShadowBlur, 0, 0,
getTextShadowColor(ambientShadowColor, textAlpha));
ambientShadowColor);
return true;
} else if (keyShadowAlpha > 0 && ambientShadowAlpha == 0) {
textView.getPaint().setShadowLayer(
keyShadowBlur,
keyShadowOffsetX,
keyShadowOffsetY,
getTextShadowColor(keyShadowColor, textAlpha));
keyShadowColor);
return true;
} else {
return false;
}
}
}
// Multiplies the alpha of shadowColor by textAlpha.
private static int getTextShadowColor(int shadowColor, int textAlpha) {
return setColorAlphaBound(shadowColor,
Math.round(Color.alpha(shadowColor) * textAlpha / 255f));
}
}