PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add padding in Fixed Landscape on the side oposite of the camera hole

Browse Source 
Fix: 380031237
Test: HomeScreenImageTest
Flag: com.android.launcher3.one_grid_specs
Change-Id: Ie7557767f629f0c7a5b7b62a3039c8a5c3cc7f43
This commit is contained in:
Sebastian Franco
2025-03-05 14:50:21 -08:00
parent cccec098e8
commit ad047c74b3
1 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/DeviceProfile.java
+31 -11
View File
@@ -30,8 +30,8 @@ import static com.android.launcher3.testing.shared.ResourceUtils.INVALID_RESOURC
import static com.android.launcher3.testing.shared.ResourceUtils.pxFromDp;
import static com.android.launcher3.testing.shared.ResourceUtils.roundPxValueFromFloat;
import static com.android.wm.shell.Flags.enableBubbleBar;
import static com.android.wm.shell.Flags.enableTinyTaskbar;
import static com.android.wm.shell.Flags.enableBubbleBarOnPhones;
import static com.android.wm.shell.Flags.enableTinyTaskbar;
import android.annotation.SuppressLint;
import android.content.Context;
@@ -1830,10 +1830,17 @@ public class DeviceProfile {
workspacePageIndicatorHeight - mWorkspacePageIndicatorOverlapWorkspace;
}
int paddingTop = workspaceTopPadding + (mIsScalableGrid ? 0 : edgeMarginPx);
// On isFixedLandscapeMode on phones we already have padding because of the camera hole
int paddingSide = inv.isFixedLandscape ? 0 : desiredWorkspaceHorizontalMarginPx;
int paddingLeft = desiredWorkspaceHorizontalMarginPx;
int paddingRight = desiredWorkspaceHorizontalMarginPx;
padding.set(paddingSide, paddingTop, paddingSide, paddingBottom);
// In fixed Landscape we don't need padding on the side next to the cutout because
// the cutout is already adding padding to all of Launcher, we only need on the other
// side
if (inv.isFixedLandscape) {
paddingLeft = isSeascape() ? desiredWorkspaceHorizontalMarginPx : 0;
paddingRight = isSeascape() ? 0 : desiredWorkspaceHorizontalMarginPx;
}
padding.set(paddingLeft, paddingTop, paddingRight, paddingBottom);
}
insetPadding(workspacePadding, cellLayoutPaddingPx);
}
@@ -1931,7 +1938,24 @@ public class DeviceProfile {
hotseatBarPadding.set(mHotseatBarWorkspaceSpacePx, paddingTop,
mInsets.right + mHotseatBarEdgePaddingPx, paddingBottom);
}
} else if (isTaskbarPresent || inv.isFixedLandscape) {
} else if (inv.isFixedLandscape) {
// Center the QSB vertically with hotseat
int hotseatBarBottomPadding = getHotseatBarBottomPadding();
int hotseatPlusQSBWidth = getHotseatRequiredWidth();
int qsbWidth = getAdditionalQsbSpace();
int availableWidthPxForHotseat = availableWidthPx - Math.abs(workspacePadding.width())
- Math.abs(cellLayoutPaddingPx.width());
int remainingSpaceOnSide = (availableWidthPxForHotseat - hotseatPlusQSBWidth) / 2;
hotseatBarPadding.set(
(remainingSpaceOnSide + qsbWidth) + mInsets.left + workspacePadding.left
+ cellLayoutPaddingPx.left,
hotseatBarSizePx - hotseatBarBottomPadding - hotseatCellHeightPx,
remainingSpaceOnSide + mInsets.right + workspacePadding.right
+ cellLayoutPaddingPx.right,
hotseatBarBottomPadding
);
} else if (isTaskbarPresent) {
// Center the QSB vertically with hotseat
int hotseatBarBottomPadding = getHotseatBarBottomPadding();
int hotseatBarTopPadding =
@@ -1950,11 +1974,6 @@ public class DeviceProfile {
}
startSpacing += getAdditionalQsbSpace();
if (inv.isFixedLandscape) {
endSpacing += mInsets.right;
startSpacing += mInsets.left;
}
hotseatBarPadding.top = hotseatBarTopPadding;
hotseatBarPadding.bottom = hotseatBarBottomPadding;
boolean isRtl = Utilities.isRtl(context.getResources());
@@ -2164,7 +2183,8 @@ public class DeviceProfile {
}
public boolean isSeascape() {
return rotationHint == Surface.ROTATION_270 && isVerticalBarLayout();
return rotationHint == Surface.ROTATION_270
&& (isVerticalBarLayout() || inv.isFixedLandscape);
}
public boolean shouldFadeAdjacentWorkspaceScreens() {