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

Change-Id: I120712cbafb0ed00608aa8d8b633f78aeb731ad2
This commit is contained in:
TreeHugger Robot
2020-05-21 15:33:11 +00:00
committed by Automerger Merge Worker

View File

@@ -250,6 +250,7 @@ public class BubbleExpandedView extends LinearLayout {
mPointerDrawable = new ShapeDrawable(TriangleShape.create( mPointerDrawable = new ShapeDrawable(TriangleShape.create(
mPointerWidth, mPointerHeight, true /* pointUp */)); mPointerWidth, mPointerHeight, true /* pointUp */));
mPointerDrawable.setTint(Color.WHITE);
mPointerView.setBackground(mPointerDrawable); mPointerView.setBackground(mPointerDrawable);
mPointerView.setVisibility(INVISIBLE); mPointerView.setVisibility(INVISIBLE);
@@ -311,14 +312,10 @@ public class BubbleExpandedView extends LinearLayout {
void applyThemeAttrs() { void applyThemeAttrs() {
final TypedArray ta = mContext.obtainStyledAttributes( final TypedArray ta = mContext.obtainStyledAttributes(
new int[] { new int[] {android.R.attr.dialogCornerRadius});
android.R.attr.colorBackgroundFloating, float cornerRadius = ta.getDimensionPixelSize(0, 0);
android.R.attr.dialogCornerRadius});
int bgColor = ta.getColor(0, Color.WHITE);
float cornerRadius = ta.getDimensionPixelSize(1, 0);
ta.recycle(); ta.recycle();
mPointerDrawable.setTint(bgColor);
if (mActivityView != null && ScreenDecorationsUtils.supportsRoundedCornersOnWindows( if (mActivityView != null && ScreenDecorationsUtils.supportsRoundedCornersOnWindows(
mContext.getResources())) { mContext.getResources())) {
mActivityView.setCornerRadius(cornerRadius); mActivityView.setCornerRadius(cornerRadius);