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

Merge "AOD: Scale icon padding with the drawing size" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-31 19:44:56 +00:00
committed by Android (Google) Code Review
parent faba1835b4 ceac4a0543
commit 59e16c9eb9
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,6 +179,10 @@ public class StatusBarIconView extends AnimatedImageView {
mIconScale = (float)imageBounds / (float)outerBounds;
}
public float getIconScaleFullyDark() {
return (float) mStatusBarIconDrawingSizeDark / mStatusBarIconDrawingSize;
}
public float getIconScale() {
return mIconScale;
}

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

@@ -267,6 +267,9 @@ public class NotificationIconContainer extends AlphaOptimizedFrameLayout {
boolean forceOverflow = mSpeedBumpIndex != -1 && i >= mSpeedBumpIndex
&& iconState.iconAppearAmount > 0.0f || i >= maxVisibleIcons;
boolean noOverflowAfter = i == childCount - 1;
float drawingScale = mDark && view instanceof StatusBarIconView
? ((StatusBarIconView) view).getIconScaleFullyDark()
: 1f;
if (mOpenedAmount != 0.0f) {
noOverflowAfter = noOverflowAfter && !hasAmbient && !forceOverflow;
}
@@ -303,7 +306,7 @@ public class NotificationIconContainer extends AlphaOptimizedFrameLayout {
visualOverflowStart += mVisualOverflowAdaption * (1f - mOpenedAmount);
}
}
translationX += iconState.iconAppearAmount * view.getWidth();
translationX += iconState.iconAppearAmount * view.getWidth() * drawingScale;
}
if (firstOverflowIndex != -1) {
int numDots = 1;