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

Merge "Status bar etc dots 4dp" into pi-dev

Browse Source 
am: d54c3a3036

Change-Id: I49514e9213e36ff5d3138c0b352af4be9b370282
This commit is contained in:
Evan Laird
2018-06-06 15:44:20 -07:00
committed by android-build-merger
parent f26e86b473 d54c3a3036
commit 9d55905221
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values/dimens.xml
View File

@@ -204,7 +204,7 @@
<dimen name="status_bar_padding_end">6dp</dimen> <dimen name="status_bar_padding_end">6dp</dimen>
<!-- the radius of the overflow dot in the status bar --> <!-- the radius of the overflow dot in the status bar -->
<dimen name="overflow_dot_radius">1dp</dimen> <dimen name="overflow_dot_radius">2dp</dimen>
<!-- the padding between dots in the icon overflow --> <!-- the padding between dots in the icon overflow -->
<dimen name="overflow_icon_dot_padding">3dp</dimen> <dimen name="overflow_icon_dot_padding">3dp</dimen>

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

@@ -122,7 +122,7 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi
private final boolean mBlocked; private final boolean mBlocked;
private int mDensity; private int mDensity;
private float mIconScale = 1.0f; private float mIconScale = 1.0f;
private final Paint mDotPaint = new Paint(); private final Paint mDotPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
private float mDotRadius; private float mDotRadius;
private int mStaticDotRadius; private int mStaticDotRadius;
private int mVisibleState = STATE_ICON; private int mVisibleState = STATE_ICON;
@@ -425,13 +425,12 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi
} }
if (mDotAppearAmount != 0.0f) { if (mDotAppearAmount != 0.0f) {
float radius; float radius;
float alpha; float alpha = Color.alpha(mDecorColor) / 255.f;
if (mDotAppearAmount <= 1.0f) { if (mDotAppearAmount <= 1.0f) {
radius = mDotRadius * mDotAppearAmount; radius = mDotRadius * mDotAppearAmount;
alpha = 1.0f;
} else { } else {
float fadeOutAmount = mDotAppearAmount - 1.0f; float fadeOutAmount = mDotAppearAmount - 1.0f;
alpha = 1.0f - fadeOutAmount; alpha = alpha * (1.0f - fadeOutAmount);
radius = NotificationUtils.interpolate(mDotRadius, getWidth() / 4, fadeOutAmount); radius = NotificationUtils.interpolate(mDotRadius, getWidth() / 4, fadeOutAmount);
} }
mDotPaint.setAlpha((int) (alpha * 255)); mDotPaint.setAlpha((int) (alpha * 255));