Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edb55e25 authored by Lyn Han's avatar Lyn Han
Browse files

Update overflow button on theme change 

Bug: 149146374
Fixes: 149176394
Test: change theme - overflow button changes with theme
Test: atest SystemUITests
Change-Id: I04d5e59f0451cac2010519477770add46aa727ee
parent 05ea3f89

packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

+9 −2
Original line number Diff line number Diff line
@@ -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. */