aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Correcting Taskbar Icon Layout bounds when Taskbar Divider is present" into udc-qpr-dev am: d34fe6d60c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24449989

Change-Id: Id33faabee0866eb3c79e31924db47142480d8ebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jagrut Desai
2023-08-18 04:33:39 +00:00
committed by Automerger Merge Worker
parent 5150489fc0 d34fe6d60c
commit 14b1fdfba3
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
View File

@@ -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;
}
/**