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

Merge "Fix extra padding when there are no static notification dots" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-07 15:41:18 +00:00
committed by Android (Google) Code Review
parent b16f1f049b 43c09a9e92
commit bb9bd1215a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java
View File

@@ -525,7 +525,7 @@ public class NotificationIconContainer extends AlphaOptimizedFrameLayout {
return 0; return 0;
} }
int partialOverflowAmount = (MAX_DOTS - mNumDots) * (mStaticDotRadius * 2 + mDotPadding); int partialOverflowAmount = (MAX_DOTS - mNumDots) * (mStaticDotDiameter + mDotPadding);
int adjustedWidth = getFinalTranslationX() + partialOverflowAmount; int adjustedWidth = getFinalTranslationX() + partialOverflowAmount;
// In case we actually give too much padding... // In case we actually give too much padding...
@@ -542,7 +542,7 @@ public class NotificationIconContainer extends AlphaOptimizedFrameLayout {
return 0; return 0;
} }
int collapsedPadding = (int) ((1.0f + OVERFLOW_EARLY_AMOUNT) * getIconSize()); int collapsedPadding = mIconSize + 2 * (mStaticDotDiameter + mDotPadding);
if (collapsedPadding + getFinalTranslationX() > getWidth()) { if (collapsedPadding + getFinalTranslationX() > getWidth()) {
collapsedPadding = getWidth() - getFinalTranslationX(); collapsedPadding = getWidth() - getFinalTranslationX();