Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix padding in QQS so tiles only move vertically in portrait"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-12-11 20:19:38 +00:00
committed by Android (Google) Code Review
parent 73cc15b505 74bd832ad4
commit 3d8a47bdbc
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java
View File

@@ -252,11 +252,9 @@ public class QuickQSPanel extends QSPanel {
final int availableWidth = getMeasuredWidth() - getPaddingStart() - getPaddingEnd();
final int leftoverWhitespace = availableWidth - maxTiles * mCellWidth;
final int smallestHorizontalMarginNeeded;
smallestHorizontalMarginNeeded = leftoverWhitespace / Math.max(1, maxTiles - 1);
if (smallestHorizontalMarginNeeded > 0){
mCellMarginHorizontal = smallestHorizontalMarginNeeded;
if (leftoverWhitespace > 0) {
mCellMarginHorizontal = leftoverWhitespace / Math.max(1, maxTiles);
mColumns = maxTiles;
} else{
mColumns = mCellWidth == 0 ? 1 :
@@ -266,7 +264,7 @@ public class QuickQSPanel extends QSPanel {
mCellMarginHorizontal = (availableWidth - mCellWidth) / 2;
} else {
mCellMarginHorizontal =
(availableWidth - mColumns * mCellWidth) / (mColumns - 1);
(availableWidth - mColumns * mCellWidth) / mColumns;
}
}
@@ -310,7 +308,8 @@ public class QuickQSPanel extends QSPanel {
// Only one column/tile. Use the margin to center the tile.
return getPaddingStart() + mCellMarginHorizontal;
}
return getPaddingStart() + column * (mCellWidth + mCellMarginHorizontal);
return getPaddingStart() + mCellMarginHorizontal / 2
+ column * (mCellWidth + mCellMarginHorizontal);
}
@Override