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

Commit 760c7f91 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use theme color for AV container background to avoid a white flash in...

Merge "Use theme color for AV container background to avoid a white flash in dark mode." into rvc-qpr-dev
parents 1706f9c2 ea9ef78f
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -306,7 +306,6 @@ public class BubbleExpandedView extends LinearLayout {
        // Set ActivityView's alpha value as zero, since there is no view content to be shown.
        setContentVisibility(false);

        mActivityViewContainer.setBackgroundColor(Color.WHITE);
        mActivityViewContainer.setOutlineProvider(new ViewOutlineProvider() {
            @Override
            public void getOutline(View view, Outline outline) {
@@ -434,9 +433,11 @@ public class BubbleExpandedView extends LinearLayout {
    }

    void applyThemeAttrs() {
        final TypedArray ta = mContext.obtainStyledAttributes(
                new int[] {android.R.attr.dialogCornerRadius});
        final TypedArray ta = mContext.obtainStyledAttributes(new int[] {
                android.R.attr.dialogCornerRadius,
                android.R.attr.colorBackgroundFloating});
        mCornerRadius = ta.getDimensionPixelSize(0, 0);
        mActivityViewContainer.setBackgroundColor(ta.getColor(1, Color.WHITE));
        ta.recycle();

        if (mActivityView != null && ScreenDecorationsUtils.supportsRoundedCornersOnWindows(