aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 02:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Only set arrow color once when below icon." into sc-v2-dev

Browse Source
This commit is contained in:
Brian Isganitis
2021-09-29 19:57:23 +00:00
committed by Android (Google) Code Review
parent 5b563706e3 8b678206cf
commit 3fca6717ed
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/launcher3/popup/ArrowPopup.java
View File

@@ -270,6 +270,15 @@ public abstract class ArrowPopup<T extends Context & ActivityContext>
backgroundColor = colors[numVisibleChild % colors.length];
}
if (!ENABLE_LOCAL_COLOR_POPUPS.get()) {
// Arrow color matches the first child or the last child.
if (!mIsAboveIcon && numVisibleChild == 0 && viewGroup == this) {
mArrowColor = backgroundColor;
} else if (mIsAboveIcon) {
mArrowColor = backgroundColor;
}
}
if (view instanceof ViewGroup && mIterateChildrenTag.equals(view.getTag())) {
assignMarginsAndBackgrounds((ViewGroup) view, backgroundColor);
numVisibleChild++;
@@ -293,12 +302,6 @@ public abstract class ArrowPopup<T extends Context & ActivityContext>
if (!ENABLE_LOCAL_COLOR_POPUPS.get()) {
setChildColor(view, backgroundColor, colorAnimator);
// Arrow color matches the first child or the last child.
if (!mIsAboveIcon && numVisibleChild == 0) {
mArrowColor = backgroundColor;
} else if (mIsAboveIcon) {
mArrowColor = backgroundColor;
}
}
numVisibleChild++;