Update taskbar overflow view to match the spec
This includes: 1) updating the color token used in dark mode, 2) adjusting sizes of individual app icons and their strokes. See screenshots in http://b/383556682#comment7. Bug: 383556682, 380386440 Flag: com.android.launcher3.taskbar_overflow Test: manual Change-Id: Ia05d803c5602552ce4f3e4675411b281107ac843
This commit is contained in:
1 parent
12d5e6aed8
commit
dcf37ce078
1 file changed
+14
-15
@@ -165,7 +165,6 @@ public class TaskbarOverflowView extends FrameLayout implements Reorderable {
|
||||
private boolean mIsRtlLayout;
|
||||
private final List<Task> mItems = new ArrayList<Task>();
|
||||
private int mIconSize;
|
||||
private int mPadding;
|
||||
private Paint mItemBackgroundPaint;
|
||||
private final MultiTranslateDelegate mTranslateDelegate = new MultiTranslateDelegate(this);
|
||||
private float mScaleForReorderBounce = 1f;
|
||||
@@ -214,25 +213,25 @@ public class TaskbarOverflowView extends FrameLayout implements Reorderable {
|
||||
TaskbarOverflowView icon = (TaskbarOverflowView) inflater.inflate(resId, group, false);
|
||||
|
||||
icon.mIconSize = iconSize;
|
||||
icon.mPadding = padding;
|
||||
|
||||
final float taskbarIconRadius =
|
||||
iconSize * IconNormalizer.ICON_VISIBLE_AREA_FACTOR / 2f - padding;
|
||||
(iconSize - padding * 2f) * IconNormalizer.ICON_VISIBLE_AREA_FACTOR / 2f;
|
||||
|
||||
icon.mLeaveBehindSizeDefault = taskbarIconRadius; // 1/2 of taskbar app icon size
|
||||
icon.mLeaveBehindSizeScaledDown =
|
||||
icon.mLeaveBehindSizeDefault * LEAVE_BEHIND_SIZE_SCALE_DOWN_MULTIPLIER;
|
||||
icon.mLeaveBehindSize = icon.mLeaveBehindSizeScaledDown;
|
||||
|
||||
icon.mItemIconStrokeWidthDefault = taskbarIconRadius / 5f; // 1/10 of taskbar app icon size
|
||||
icon.mItemIconStrokeWidthDefault =
|
||||
taskbarIconRadius / 10f; // 1/20 of taskbar app icon size
|
||||
icon.mItemIconStrokeWidth = icon.mItemIconStrokeWidthDefault;
|
||||
|
||||
icon.mItemIconSizeDefault = 2 * (taskbarIconRadius - icon.mItemIconStrokeWidthDefault)
|
||||
* TWO_ITEM_ICONS_BOX_ASPECT_RATIO;
|
||||
icon.mItemIconSizeDefault = 2f * taskbarIconRadius * TWO_ITEM_ICONS_BOX_ASPECT_RATIO;
|
||||
icon.mItemIconSizeScaledDown = icon.mLeaveBehindSizeScaledDown;
|
||||
icon.mItemIconSize = icon.mItemIconSizeDefault;
|
||||
|
||||
icon.mItemIconCenterOffsetDefault = taskbarIconRadius - icon.mItemIconSizeDefault / 2f
|
||||
icon.mItemIconCenterOffsetDefault = taskbarIconRadius
|
||||
- icon.mItemIconSizeDefault * IconNormalizer.ICON_VISIBLE_AREA_FACTOR / 2f
|
||||
- icon.mItemIconStrokeWidthDefault;
|
||||
icon.mItemIconCenterOffset = icon.mItemIconCenterOffsetDefault;
|
||||
|
||||
@@ -242,9 +241,8 @@ public class TaskbarOverflowView extends FrameLayout implements Reorderable {
|
||||
private void init() {
|
||||
mIsRtlLayout = Utilities.isRtl(getResources());
|
||||
mItemBackgroundPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
|
||||
mItemBackgroundColor = getContext().getColor(Utilities.isDarkTheme(getContext())
|
||||
? com.android.internal.R.color.materialColorSurface
|
||||
: com.android.internal.R.color.materialColorInverseOnSurface);
|
||||
mItemBackgroundColor = getContext().getColor(
|
||||
com.android.internal.R.color.materialColorInverseOnSurface);
|
||||
mLeaveBehindColor = Themes.getAttrColor(getContext(), android.R.attr.textColorTertiary);
|
||||
|
||||
setWillNotDraw(false);
|
||||
@@ -260,8 +258,9 @@ public class TaskbarOverflowView extends FrameLayout implements Reorderable {
|
||||
|
||||
private void drawAppIcons(@NonNull Canvas canvas) {
|
||||
mItemBackgroundPaint.setColor(mItemBackgroundColor);
|
||||
float radius = mIconSize / 2f - mPadding;
|
||||
float canvasCenterXY = mIconSize / 2f;
|
||||
int adjustedItemIconSize = Math.round(mItemIconSize);
|
||||
float itemIconRadius = adjustedItemIconSize / 2f;
|
||||
|
||||
int itemsToShow = Math.min(mItems.size(), MAX_ITEMS_IN_PREVIEW);
|
||||
for (int i = itemsToShow - 1; i >= 0; --i) {
|
||||
@@ -280,12 +279,12 @@ public class TaskbarOverflowView extends FrameLayout implements Reorderable {
|
||||
BlendMode.SRC_ATOP));
|
||||
|
||||
canvas.save();
|
||||
float itemIconRadius = adjustedItemIconSize / 2f;
|
||||
canvas.translate(
|
||||
mPadding + itemCenterX + radius - itemIconRadius,
|
||||
mPadding + itemCenterY + radius - itemIconRadius);
|
||||
canvasCenterXY + itemCenterX - itemIconRadius,
|
||||
canvasCenterXY + itemCenterY - itemIconRadius);
|
||||
canvas.drawCircle(itemIconRadius, itemIconRadius,
|
||||
itemIconRadius + mItemIconStrokeWidth, mItemBackgroundPaint);
|
||||
itemIconRadius * IconNormalizer.ICON_VISIBLE_AREA_FACTOR + mItemIconStrokeWidth,
|
||||
mItemBackgroundPaint);
|
||||
iconCopy.draw(canvas);
|
||||
canvas.restore();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user