PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Merge "Separate color into app color and dot color; specify dot color" into tm-dev

Browse Source
This commit is contained in:
James O'Leary
2022-05-12 16:37:39 +00:00
committed by Android (Google) Code Review
parent a54d1ab24a 1557ba37c1
commit 508fbbff56
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
+1 -1
View File
@@ -180,7 +180,7 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView {
: null; : null;
super.applyFromWorkspaceItem(info, animate, staggerIndex); super.applyFromWorkspaceItem(info, animate, staggerIndex);
int oldPlateColor = mPlateColor; int oldPlateColor = mPlateColor;
int newPlateColor = ColorUtils.setAlphaComponent(mDotParams.color, 200); int newPlateColor = ColorUtils.setAlphaComponent(mDotParams.appColor, 200);
if (!animate) { if (!animate) {
mPlateColor = newPlateColor; mPlateColor = newPlateColor;
} }
src/com/android/launcher3/BubbleTextView.java
+5 -2
View File
@@ -253,7 +253,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
*/ */
public void reset() { public void reset() {
mDotInfo = null; mDotInfo = null;
mDotParams.color = Color.TRANSPARENT; mDotParams.dotColor = Color.TRANSPARENT;
mDotParams.appColor = Color.TRANSPARENT;
cancelDotScaleAnim(); cancelDotScaleAnim();
mDotParams.scale = 0f; mDotParams.scale = 0f;
mForceHideDot = false; mForceHideDot = false;
@@ -381,7 +382,9 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
flags |= FLAG_NO_BADGE; flags |= FLAG_NO_BADGE;
} }
FastBitmapDrawable iconDrawable = info.newIcon(getContext(), flags); FastBitmapDrawable iconDrawable = info.newIcon(getContext(), flags);
mDotParams.color = iconDrawable.getIconColor(); mDotParams.appColor = iconDrawable.getIconColor();
mDotParams.dotColor = getContext().getResources()
.getColor(android.R.color.system_accent3_100, getContext().getTheme());
setIcon(iconDrawable); setIcon(iconDrawable);
applyLabel(info); applyLabel(info);
} }
src/com/android/launcher3/folder/FolderIcon.java
+1 -1
View File
@@ -637,7 +637,7 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
// If we are animating to the accepting state, animate the dot out. // If we are animating to the accepting state, animate the dot out.
mDotParams.scale = Math.max(0, mDotScale - mBackground.getScaleProgress()); mDotParams.scale = Math.max(0, mDotScale - mBackground.getScaleProgress());
mDotParams.color = mBackground.getDotColor(); mDotParams.dotColor = mBackground.getDotColor();
mDotRenderer.draw(canvas, mDotParams); mDotRenderer.draw(canvas, mDotParams);
} }
} }