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

Commit ad69c72a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
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 am: 760c7f91

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12326450

Change-Id: Idfce2b883ceeeaaf16381f013e5b1d878dad00b0
parents 769c4f68 760c7f91
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(