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 
am: 7fddea0e29

Change-Id: Iba31c97cee184c1156d91f34dcb5654fe0966524
This commit is contained in:
Lyn Han
2019-04-04 20:03:51 -07:00
committed by android-build-merger
parent 2f8faeb717 7fddea0e29
commit 4cd19d4058
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() { public void onConfigChanged() {
for (Bubble b: mBubbleData.getBubbles()) { for (Bubble b: mBubbleData.getBubbles()) {
b.iconView.updateViews();
b.expandedView.updateHeaderColor(); 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) { if (mEntry == null) {
return; return;
} }
@@ -186,6 +186,13 @@ public class BubbleView extends FrameLayout {
} }
private Drawable buildIconWithTint(Drawable iconDrawable, int backgroundColor) { 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 */); backgroundColor = ColorUtils.setAlphaComponent(backgroundColor, 255 /* alpha */);
if (backgroundColor == Color.TRANSPARENT) { if (backgroundColor == Color.TRANSPARENT) {
// ColorUtils throws exception when background is translucent. // 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); int dark = ColorUtils.setAlphaComponent(Color.BLACK, DARK_ICON_ALPHA);
iconDrawable.setTint(dark); iconDrawable.setTint(dark);
} }
InsetDrawable foreground = new InsetDrawable(iconDrawable, mIconInset); return iconDrawable;
ColorDrawable background = new ColorDrawable(backgroundColor);
return new AdaptiveIconDrawable(background, foreground);
} }
private int determineDominateColor(Drawable d, int defaultTint) { private int determineDominateColor(Drawable d, int defaultTint) {