Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b678206 authored by Brian Isganitis's avatar Brian Isganitis
Browse files

Only set arrow color once when below icon. 

We were setting it again for the first child in any recursive call,
which could cause the color to be incorrect.

Test: Arrow always matches menu item below icon.
Fix: 201537864
Change-Id: I8f344bb7bdec4ebc51f8b8de118bec678d71e649
parent 1ad55e6a

src/com/android/launcher3/popup/ArrowPopup.java

+9 −6
Original line number Diff line number Diff line
@@ -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++;