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

Commit 4bdc5b06 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Tint the pointer white at all times." into rvc-dev am: 86b5fa9c am:...

Merge "Tint the pointer white at all times." into rvc-dev am: 86b5fa9c am: edd9c878 am: b202649b am: 931105c6

Change-Id: Ic8bd60f825cc336f6f006aaec6462b4beb550ce0
parents 38002f3c 931105c6
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ public class BubbleExpandedView extends LinearLayout {

        mPointerDrawable = new ShapeDrawable(TriangleShape.create(
                mPointerWidth, mPointerHeight, true /* pointUp */));
        mPointerDrawable.setTint(Color.WHITE);
        mPointerView.setBackground(mPointerDrawable);
        mPointerView.setVisibility(INVISIBLE);

@@ -311,14 +312,10 @@ public class BubbleExpandedView extends LinearLayout {

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

        mPointerDrawable.setTint(bgColor);
        if (mActivityView != null && ScreenDecorationsUtils.supportsRoundedCornersOnWindows(
                mContext.getResources())) {
            mActivityView.setCornerRadius(cornerRadius);