aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-04 01:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Calculate taskbar content size for edu" into tm-qpr-dev

Browse Source
This commit is contained in:
Thales Lima
2022-11-01 17:57:53 +00:00
committed by Android (Google) Code Review
parent 120c99f440 a64a914ddf
commit b1d991b3de
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
quickstep/src/com/android/launcher3/taskbar/TaskbarEduController.java
View File

@@ -219,7 +219,7 @@ public class TaskbarEduController implements TaskbarControllers.LoggableTaskbarC
}
int getIconLayoutBoundsWidth() {
return mControllers.taskbarViewController.getIconLayoutBounds().width();
return mControllers.taskbarViewController.getIconLayoutWidth();
}
}
}

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

@@ -293,12 +293,8 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
int count = getChildCount();
int countExcludingQsb = count;
DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();
if (deviceProfile.isQsbInline) {
countExcludingQsb--;
}
int spaceNeeded = countExcludingQsb * (mItemMarginLeftRight * 2 + mIconTouchSize);
int spaceNeeded = getIconLayoutWidth();
int navSpaceNeeded = deviceProfile.hotseatBarEndOffset;
boolean layoutRtl = isLayoutRtl();
int iconEnd = right - (right - left - spaceNeeded) / 2;
@@ -388,6 +384,18 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
return mIconLayoutBounds;
}
/**
* Returns the space used by the icons
*/
public int getIconLayoutWidth() {
int countExcludingQsb = getChildCount();
DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();
if (deviceProfile.isQsbInline) {
countExcludingQsb--;
}
return countExcludingQsb * (mItemMarginLeftRight * 2 + mIconTouchSize);
}
/**
* Returns the app icons currently shown in the taskbar.
*/

4
quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
View File

@@ -199,6 +199,10 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
return mTaskbarView.getIconLayoutBounds();
}
public int getIconLayoutWidth() {
return mTaskbarView.getIconLayoutWidth();
}
public View[] getIconViews() {
return mTaskbarView.getIconViews();
}