Merge "Fix hotseat icon translation issue" into main (9b3d882c) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Hotseat.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -97,10 +97,9 @@ public class Hotseat extends CellLayout implements Insettable {
		if (bubbleBarEnabled) {
		float adjustedBorderSpace = dp.getHotseatAdjustedBorderSpaceForBubbleBar(getContext());
		if (hasBubbles && Float.compare(adjustedBorderSpace, 0f) != 0) {
		getShortcutsAndWidgets().setTranslationProvider(child -> {
		int index = getShortcutsAndWidgets().indexOfChild(child);
		getShortcutsAndWidgets().setTranslationProvider(cellX -> {
		float borderSpaceDelta = adjustedBorderSpace - dp.hotseatBorderSpace;
		return dp.iconSizePx + index * borderSpaceDelta;
		return dp.iconSizePx + cellX * borderSpaceDelta;
		});
		if (mQsb instanceof HorizontalInsettableView) {
		HorizontalInsettableView insettableQsb = (HorizontalInsettableView) mQsb;
		@@ -147,10 +146,7 @@ public class Hotseat extends CellLayout implements Insettable {

		// update the translation provider for future layout passes of hotseat icons.
		if (isBubbleBarVisible) {
		icons.setTranslationProvider(child -> {
		int index = icons.indexOfChild(child);
		return dp.iconSizePx + index * borderSpaceDelta;
		});
		icons.setTranslationProvider(cellX -> dp.iconSizePx + cellX * borderSpaceDelta);
		} else {
		icons.setTranslationProvider(null);
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -245,7 +245,7 @@ public class ShortcutAndWidgetContainer extends ViewGroup implements FolderIcon.
		}
		child.layout(childLeft, childTop, childLeft + lp.width, childTop + lp.height);
		if (mTranslationProvider != null) {
		final float tx = mTranslationProvider.getTranslationX(child);
		final float tx = mTranslationProvider.getTranslationX(lp.getCellX());
		if (child instanceof Reorderable) {
		((Reorderable) child).getTranslateDelegate()
		.getTranslationX(INDEX_BUBBLE_ADJUSTMENT_ANIM)
		@@ -330,6 +330,6 @@ public class ShortcutAndWidgetContainer extends ViewGroup implements FolderIcon.

		/** Provides translation values to apply when laying out child views. */
		interface TranslationProvider {
		float getTranslationX(View child);
		float getTranslationX(int cellX);
		}
		}