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

Match taskbar edge padding to nav button end insets

Browse Source 
When calculating max number of items to show in a taskbar with overflow,
reserve space for taskbar end/start margins that matches inline nav
buttons end spacing.

Bug: 368119679
Test: None
Flag: com.android.launcher3.taskbar_overflow
Change-Id: I1205663ed4455ae1e7807f8d4edf5aaf2beba7d4
This commit is contained in:
Toni Barzic
2024-10-25 17:48:20 +00:00
parent d6f39e3f45
commit 20e420ca40
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+4 -2
View File
@@ -197,11 +197,13 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
private int calculateMaxNumIcons() {
DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();
int availableWidth = deviceProfile.widthPx;
int defaultEdgeMargin =
(int) getResources().getDimension(deviceProfile.inv.inlineNavButtonsEndSpacing);
// Reserve space required for edge margins, or for navbar if shown. If task bar needs to be
// center aligned with nav bar shown, reserve space on both sides.
availableWidth -= Math.max(deviceProfile.edgeMarginPx, deviceProfile.hotseatBarEndOffset);
availableWidth -= Math.max(deviceProfile.edgeMarginPx,
availableWidth -= Math.max(defaultEdgeMargin, deviceProfile.hotseatBarEndOffset);
availableWidth -= Math.max(defaultEdgeMargin,
mShouldTryStartAlign ? 0 : deviceProfile.hotseatBarEndOffset);
// The space taken by an item icon used during layout.