feat: Fix hotseat paddings on phones (4d7e6ac3) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/DeviceProfile.java

+11 −12

Original line number	Diff line number	Diff line
		@@ -445,7 +445,7 @@ public class DeviceProfile {
		isTaskbarPresent = (isTablet \|\| (taskbarOrBubbleBarOnPhones && isGestureMode))
		&& wmProxy.isTaskbarDrawnInProcess();

		isNoHintGesture = LineageSettings.System.getInt(
		isNoHintGesture = isGestural() && LineageSettings.System.getInt(
		context.getContentResolver(), LineageSettings.System.NAVIGATION_BAR_HINT, 0) != 1;

		// Some more constants.
		@@ -2082,19 +2082,17 @@ public class DeviceProfile {
		float hotseatCellWidth = (float) widthPx / numShownHotseatIcons;
		int hotseatAdjustment = Math.round((workspaceCellWidth - hotseatCellWidth) / 2);
		int hotseatIconMargin = Math.abs(hotseatCellHeightPx - iconSizePx);
		boolean noHint = isFullyGesture && LineageSettings.System.getInt(
		context.getContentResolver(), LineageSettings.System.NAVIGATION_BAR_HINT, 0) != 1;
		// Values obtained by manual validation, independent of dpi and display scale
		double marginScaleFactor = isFullyGesture
		? (noHint ? 2.5 : 3.25)
		? (isNoHintGesture ? 2.5 : 3.25)
		: 2.75;
		hotseatBarPadding.set(
		hotseatAdjustment + workspacePadding.left + cellLayoutPaddingPx.left
		+ mInsets.left,
		getHotseatBarTopPadding(),
		isNoHintGesture ? (hotseatBarSizePx - hotseatCellHeightPx) / 2 : 0,
		hotseatAdjustment + workspacePadding.right + cellLayoutPaddingPx.right
		+ mInsets.right,
		noHint ? getHotseatBarBottomPadding() - (getHotseatBarBottomPadding() / 2)
		isNoHintGesture ? getHotseatBarBottomPadding() - (getHotseatBarBottomPadding() / 2)
		: getHotseatBarBottomPadding() - (int) (marginScaleFactor * hotseatIconMargin));
		}
		return hotseatBarPadding;
		@@ -2180,8 +2178,11 @@ public class DeviceProfile {
		}

		} else {
		return hotseatBarBottomSpacePx +
		(int) ((isGestural() ? (isNoHintGesture ? -2.5f : 1f) : 2f) * heightDifference);
		if (isNoHintGesture) {
		return Math.abs(hotseatBarSizePx - iconSizePx) / 2;
		}
		return hotseatBarBottomSpacePx + (int) ((isGestural() ? .75f : 2f)
		* heightDifference);
		}

		}
		@@ -2332,9 +2333,7 @@ public class DeviceProfile {

		private int getDeductibleGestureHeight() {
		if (isVerticalBarLayout() \|\| context == null) return 0;
		boolean noHint = isGestural() && LineageSettings.System.getInt(
		context.getContentResolver(), LineageSettings.System.NAVIGATION_BAR_HINT, 0) != 1;
		if (!noHint) return 0;
		if (!isNoHintGesture) return 0;
		return ResourceUtils.getDimenByName(NAVBAR_BOTTOM_GESTURE_SIZE, context.getResources(), 0);
		}