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

Merge "Making the QSB align in Fixed Landscape" into main

Browse Source
This commit is contained in:
Sebastián Franco
2024-11-18 18:34:00 +00:00
committed by Android (Google) Code Review
parent 933baa72cf 5353cd8626
commit fefe9bbd12
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/DeviceProfile.java
+4 -5
View File
@@ -1833,7 +1833,8 @@ public class DeviceProfile {
workspacePageIndicatorHeight - mWorkspacePageIndicatorOverlapWorkspace;
}
int paddingTop = workspaceTopPadding + (mIsScalableGrid ? 0 : edgeMarginPx);
int paddingSide = desiredWorkspaceHorizontalMarginPx;
// On isFixedLandscapeMode on phones we already have padding because of the camera hole
int paddingSide = inv.isFixedLandscapeMode ? 0 : desiredWorkspaceHorizontalMarginPx;
padding.set(paddingSide, paddingTop, paddingSide, paddingBottom);
}
@@ -1941,10 +1942,8 @@ public class DeviceProfile {
startSpacing += getAdditionalQsbSpace();
if (inv.isFixedLandscapeMode) {
endSpacing += workspacePadding.right + cellLayoutPaddingPx.right
+ mInsets.right;
startSpacing += workspacePadding.left + cellLayoutPaddingPx.left
+ mInsets.left;
endSpacing += mInsets.right;
startSpacing += mInsets.left;
}
hotseatBarPadding.top = hotseatBarTopPadding;
src/com/android/launcher3/LauncherFiles.java
+2 -2
View File
@@ -24,7 +24,7 @@ public class LauncherFiles {
public static final String LAUNCHER_4_BY_4_DB = "launcher_4_by_4.db";
public static final String LAUNCHER_3_BY_3_DB = "launcher_3_by_3.db";
public static final String LAUNCHER_2_BY_2_DB = "launcher_2_by_2.db";
public static final String LAUNCHER_7_BY_3_DB = "launcher_7_by_3.db";
public static final String LAUNCHER_8_BY_3_DB = "launcher_8_by_3.db";
public static final String BACKUP_DB = "backup.db";
public static final String SHARED_PREFERENCES_KEY = "com.android.launcher3.prefs";
public static final String MANAGED_USER_PREFERENCES_KEY =
@@ -45,7 +45,7 @@ public class LauncherFiles {
LAUNCHER_4_BY_4_DB,
LAUNCHER_3_BY_3_DB,
LAUNCHER_2_BY_2_DB,
LAUNCHER_7_BY_3_DB));
LAUNCHER_8_BY_3_DB));
public static final List<String> OTHER_FILES = Collections.unmodifiableList(Arrays.asList(
BACKUP_DB,