Skip to content

Commit af73a17

Browse files
drewhamiltonwcshi
authored andcommitted
[ShapeableImageView] Call invalidateOutline when shape is changed
Resolves #1769 PiperOrigin-RevId: 342118551
1 parent e1d9796 commit af73a17

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

catalog/java/io/material/catalog/imageview/res/layout/catalog_imageview.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
app:strokeColor="?attr/colorSecondary"
6767
app:shapeAppearance="?attr/shapeAppearanceMediumComponent"
6868
app:strokeWidth="1dp"
69-
app:elevation="5dp"
69+
android:elevation="5dp"
7070
android:padding="8dp"
7171
app:srcCompat="@drawable/dog_image" />
7272

@@ -85,7 +85,7 @@
8585
android:layout_height="wrap_content"
8686
android:adjustViewBounds="true"
8787
android:scaleType="fitXY"
88-
app:elevation="5dp"
88+
android:elevation="5dp"
8989
app:shapeAppearance="@style/ShapeAppearanceImageLeft"
9090
app:srcCompat="@drawable/cat_image"
9191
app:strokeColor="?attr/colorSecondary"
@@ -99,7 +99,7 @@
9999
android:layout_weight="1"
100100
android:adjustViewBounds="true"
101101
android:scaleType="fitXY"
102-
app:elevation="5dp"
102+
android:elevation="5dp"
103103
app:shapeAppearance="@style/ShapeAppearanceImageRight"
104104
app:srcCompat="@drawable/cateyes_image"
105105
app:strokeColor="?attr/colorSecondary"

lib/java/com/google/android/material/imageview/ShapeableImageView.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,9 @@ public void setShapeAppearanceModel(@NonNull ShapeAppearanceModel shapeAppearanc
146146
}
147147
updateShapeMask(getWidth(), getHeight());
148148
invalidate();
149+
if (VERSION.SDK_INT >= 21) {
150+
invalidateOutline();
151+
}
149152
}
150153

151154
@NonNull

0 commit comments

Comments
 (0)