Merge "Fix Taskabr Divider Line traveling too far" into main (524e05b9) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -714,13 +714,19 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
		continue;
		}

		int positionInHotseat;
		if (isAllAppsButton \|\| isTaskbarDividerView) {
		// Note that there is no All Apps button or taskbar divider view in the hotseat,
		float positionInHotseat;
		if (isAllAppsButton) {
		// Note that there is no All Apps button in the hotseat,
		// this position is only used as its convenient for animation purposes.
		positionInHotseat = Utilities.isRtl(child.getResources())
		? taskbarDp.numShownHotseatIcons
		: -1;
		} else if (isTaskbarDividerView) {
		// Note that there is no taskbar divider view in the hotseat,
		// this position is only used as its convenient for animation purposes.
		positionInHotseat = Utilities.isRtl(child.getResources())
		? taskbarDp.numShownHotseatIcons - 0.5f
		: -0.5f;
		} else if (child.getTag() instanceof ItemInfo) {
		positionInHotseat = ((ItemInfo) child.getTag()).screenId;
		} else {