Update overflow button on theme change

Bug: 149146374
Fixes: 149176394
Test: change theme - overflow button changes with theme
Test: atest SystemUITests
Change-Id: I04d5e59f0451cac2010519477770add46aa727ee
This commit is contained in:
Lyn Han
2020-02-12 18:55:39 -08:00
parent 05ea3f89da
commit edb55e25b7
2 changed files with 11 additions and 3 deletions

View File

@@ -294,7 +294,8 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList
ta.recycle();
mPointerDrawable.setTint(bgColor);
if (ScreenDecorationsUtils.supportsRoundedCornersOnWindows(mContext.getResources())) {
if (mActivityView != null && ScreenDecorationsUtils.supportsRoundedCornersOnWindows(
mContext.getResources())) {
mActivityView.setCornerRadius(cornerRadius);
}
}

View File

@@ -528,6 +528,12 @@ public class BubbleStackView extends FrameLayout {
mBubbleContainer.addView(mOverflowBtn, 0,
new FrameLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT));
setOverflowBtnTheme();
mOverflowBtn.setVisibility(GONE);
}
// TODO(b/149146374) Propagate theme change to bubbles in overflow.
private void setOverflowBtnTheme() {
TypedArray ta = mContext.obtainStyledAttributes(
new int[]{android.R.attr.colorBackgroundFloating});
int bgColor = ta.getColor(0, Color.WHITE /* default */);
@@ -537,8 +543,6 @@ public class BubbleStackView extends FrameLayout {
ColorDrawable bg = new ColorDrawable(bgColor);
AdaptiveIconDrawable adaptiveIcon = new AdaptiveIconDrawable(bg, fg);
mOverflowBtn.setImageDrawable(adaptiveIcon);
mOverflowBtn.setVisibility(GONE);
}
void showExpandedViewContents(int displayId) {
@@ -568,6 +572,9 @@ public class BubbleStackView extends FrameLayout {
*/
public void onThemeChanged() {
setUpFlyout();
if (BubbleExperimentConfig.allowBubbleOverflow(mContext)) {
setOverflowBtnTheme();
}
}
/** Respond to the phone being rotated by repositioning the stack and hiding any flyouts. */