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

Merge "Ensure that the Hotseat respects the margins of the QSB."

Browse Source
This commit is contained in:
Luca Zuccarini
2022-02-25 15:10:49 +00:00
committed by Android (Google) Code Review
parent 20f1328b96 410c75a442
commit dfa9ee5ceb
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Hotseat.java
+9 -3
View File
@@ -173,9 +173,15 @@ public class Hotseat extends CellLayout implements Insettable {
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
int width = mActivity.getDeviceProfile().isQsbInline
? mActivity.getDeviceProfile().qsbWidth
: getShortcutsAndWidgets().getMeasuredWidth();
int width;
if (mActivity.getDeviceProfile().isQsbInline) {
width = mActivity.getDeviceProfile().qsbWidth;
} else {
MarginLayoutParams qsbParams = (MarginLayoutParams) mQsb.getLayoutParams();
width = getShortcutsAndWidgets().getMeasuredWidth()
- qsbParams.getMarginStart()
- qsbParams.getMarginEnd();
}
mQsb.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
MeasureSpec.makeMeasureSpec(mQsbHeight, MeasureSpec.EXACTLY));