diff --git a/lib/java/com/google/android/material/card/MaterialCardView.java b/lib/java/com/google/android/material/card/MaterialCardView.java
index 7dea7183f4c..7340e166ac4 100644
--- a/lib/java/com/google/android/material/card/MaterialCardView.java
+++ b/lib/java/com/google/android/material/card/MaterialCardView.java
@@ -30,6 +30,7 @@
import androidx.appcompat.content.res.AppCompatResources;
import android.util.AttributeSet;
import android.util.Log;
+import android.view.Gravity;
import android.view.View;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeInfo;
@@ -103,7 +104,7 @@ public interface OnCheckedChangeListener {
* @see #setCheckedIconGravity(int)
* @see #getCheckedIconGravity()
*/
- public static final int CHECKED_ICON_GRAVITY_TOP_START = 0x1;
+ public static final int CHECKED_ICON_GRAVITY_TOP_START = Gravity.TOP | Gravity.START;
/**
* Gravity used to position the checked icon at the bottom|start of the Card.
@@ -111,7 +112,7 @@ public interface OnCheckedChangeListener {
* @see #setCheckedIconGravity(int)
* @see #getCheckedIconGravity()
*/
- public static final int CHECKED_ICON_GRAVITY_BOTTOM_START = 0x2;
+ public static final int CHECKED_ICON_GRAVITY_BOTTOM_START = Gravity.BOTTOM | Gravity.START;
/**
* Gravity used to position the checked icon at the top|end of the Card.
@@ -119,7 +120,7 @@ public interface OnCheckedChangeListener {
* @see #setCheckedIconGravity(int)
* @see #getCheckedIconGravity()
*/
- public static final int CHECKED_ICON_GRAVITY_TOP_END = 0x3;
+ public static final int CHECKED_ICON_GRAVITY_TOP_END = Gravity.TOP | Gravity.END;
/**
* Gravity used to position the checked icon at the bottom|end of the Card.
@@ -127,7 +128,7 @@ public interface OnCheckedChangeListener {
* @see #setCheckedIconGravity(int)
* @see #getCheckedIconGravity()
*/
- public static final int CHECKED_ICON_GRAVITY_BOTTOM_END = 0x4;
+ public static final int CHECKED_ICON_GRAVITY_BOTTOM_END = Gravity.BOTTOM | Gravity.END;
/** Positions the icon can be set to. */
@IntDef({
diff --git a/lib/java/com/google/android/material/card/MaterialCardViewHelper.java b/lib/java/com/google/android/material/card/MaterialCardViewHelper.java
index cfdee2f9313..066da41c4e1 100644
--- a/lib/java/com/google/android/material/card/MaterialCardViewHelper.java
+++ b/lib/java/com/google/android/material/card/MaterialCardViewHelper.java
@@ -19,8 +19,6 @@
import com.google.android.material.R;
import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
-import static com.google.android.material.card.MaterialCardView.CHECKED_ICON_GRAVITY_BOTTOM_END;
-import static com.google.android.material.card.MaterialCardView.CHECKED_ICON_GRAVITY_BOTTOM_START;
import static com.google.android.material.card.MaterialCardView.CHECKED_ICON_GRAVITY_TOP_END;
import android.content.res.ColorStateList;
@@ -38,6 +36,7 @@
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.view.ViewCompat;
import android.util.AttributeSet;
+import android.view.Gravity;
import android.view.View;
import androidx.annotation.ColorInt;
import androidx.annotation.Dimension;
@@ -690,12 +689,10 @@ void setCheckedIconGravity(@CheckedIconGravity int checkedIconGravity) {
}
private boolean isCheckedIconEnd() {
- return checkedIconGravity == CHECKED_ICON_GRAVITY_TOP_END
- || checkedIconGravity == CHECKED_ICON_GRAVITY_BOTTOM_END;
+ return (checkedIconGravity & Gravity.END) == Gravity.END;
}
private boolean isCheckedIconBottom() {
- return checkedIconGravity == CHECKED_ICON_GRAVITY_BOTTOM_START
- || checkedIconGravity == CHECKED_ICON_GRAVITY_BOTTOM_END;
+ return (checkedIconGravity & Gravity.BOTTOM) == Gravity.BOTTOM;
}
}
diff --git a/lib/java/com/google/android/material/card/res/values/attrs.xml b/lib/java/com/google/android/material/card/res/values/attrs.xml
index cb120cdf380..511c6e69da3 100644
--- a/lib/java/com/google/android/material/card/res/values/attrs.xml
+++ b/lib/java/com/google/android/material/card/res/values/attrs.xml
@@ -47,14 +47,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+