Merge "Only set arrow color once when below icon." into sc-v2-dev (3fca6717) · Commits · e / os / android_packages_apps_Trebuchet

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++;