Merge "AOD: Scale icon padding with the drawing size" into oc-dev am: 59e16c9eb9 (d7454d03) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}

+4 −1

Original line number	Diff line number	Diff line
		@@ -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;