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

Merge "Update shape for all bubbles" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-05 02:41:01 +00:00
committed by Android (Google) Code Review
parent ec2d399a9e 80b8011dce
commit 7fddea0e29
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
View File

@@ -303,6 +303,7 @@ public class BubbleStackView extends FrameLayout {
*/
public void onConfigChanged() {
for (Bubble b: mBubbleData.getBubbles()) {
b.iconView.updateViews();
b.expandedView.updateHeaderColor();
}
}

13
packages/SystemUI/src/com/android/systemui/bubbles/BubbleView.java
View File

@@ -159,7 +159,7 @@ public class BubbleView extends FrameLayout {
}
}
private void updateViews() {
void updateViews() {
if (mEntry == null) {
return;
}
@@ -186,6 +186,13 @@ public class BubbleView extends FrameLayout {
}
private Drawable buildIconWithTint(Drawable iconDrawable, int backgroundColor) {
iconDrawable = checkTint(iconDrawable, backgroundColor);
InsetDrawable foreground = new InsetDrawable(iconDrawable, mIconInset);
ColorDrawable background = new ColorDrawable(backgroundColor);
return new AdaptiveIconDrawable(background, foreground);
}
private Drawable checkTint(Drawable iconDrawable, int backgroundColor) {
backgroundColor = ColorUtils.setAlphaComponent(backgroundColor, 255 /* alpha */);
if (backgroundColor == Color.TRANSPARENT) {
// ColorUtils throws exception when background is translucent.
@@ -197,9 +204,7 @@ public class BubbleView extends FrameLayout {
int dark = ColorUtils.setAlphaComponent(Color.BLACK, DARK_ICON_ALPHA);
iconDrawable.setTint(dark);
}
InsetDrawable foreground = new InsetDrawable(iconDrawable, mIconInset);
ColorDrawable background = new ColorDrawable(backgroundColor);
return new AdaptiveIconDrawable(background, foreground);
return iconDrawable;
}
private int determineDominateColor(Drawable d, int defaultTint) {