Merge "Correcting Taskbar Icon Layout bounds when Taskbar Divider is present" into udc-qpr-dev (d34fe6d6) · Commits · e / os / BlissLauncher3

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

+9 −6

Original line number	Diff line number	Diff line
		@@ -386,11 +386,6 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
		int count = getChildCount();
		DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();
		int spaceNeeded = getIconLayoutWidth();
		// We are removing the margin from taskbar divider item in taskbar,
		// so remove it from spacing also.
		if (FeatureFlags.ENABLE_TASKBAR_PINNING.get() && count > 1) {
		spaceNeeded -= mIconTouchSize;
		}
		int navSpaceNeeded = deviceProfile.hotseatBarEndOffset;
		boolean layoutRtl = isLayoutRtl();
		int centerAlignIconEnd = right - (right - left - spaceNeeded) / 2;
		@@ -511,7 +506,15 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
		if (deviceProfile.isQsbInline) {
		countExcludingQsb--;
		}
		return countExcludingQsb * (mItemMarginLeftRight * 2 + mIconTouchSize);
		int iconLayoutBoundsWidth =
		countExcludingQsb * (mItemMarginLeftRight * 2 + mIconTouchSize);

		if (FeatureFlags.ENABLE_TASKBAR_PINNING.get() && countExcludingQsb > 1) {
		// We are removing 4 * mItemMarginLeftRight as there should be no space between
		// All Apps icon, divider icon, and first app icon in taskbar
		iconLayoutBoundsWidth -= mItemMarginLeftRight * 4;
		}
		return iconLayoutBoundsWidth;
		}

		/**