From bc56d5b43b93ab6dbed4d561ad8b8b1351f9535c Mon Sep 17 00:00:00 2001
From: conradchen <conradchen@google.com>
Date: Mon, 8 Nov 2021 15:38:50 -0500
Subject: [PATCH] [M3][Card] Change checkedIconGravity values to enum

PiperOrigin-RevId: 408415041
---
 .../android/material/card/MaterialCardView.java  |  9 +++++----
 .../material/card/MaterialCardViewHelper.java    |  9 +++------
 .../android/material/card/res/values/attrs.xml   | 16 ++++++++--------
 3 files changed, 16 insertions(+), 18 deletions(-)

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 @@
     <attr name="checkedIconMargin" format="dimension"/>
     <!-- Specifies how the checked icon should be positioned. -->
     <attr name="checkedIconGravity">
-      <!-- Push icon to the top|start of the card. -->
-      <flag name="TOP_START" value="0x1"/>
-      <!--  Push icon to the bottom|start of the card. -->
-      <flag name="BOTTOM_START" value="0x2"/>
-      <!-- Push icon to the top|end of the card. -->
-      <flag name="TOP_END" value="0x3"/>
-      <!-- Push icon to the bottom|end of the card. -->
-      <flag name="BOTTOM_END" value="0x4"/>
+      <!-- Gravity.TOP | Gravity.END -->
+      <enum name="TOP_END" value ="8388661"/>
+      <!-- Gravity.TOP | Gravity.START -->
+      <enum name="TOP_START" value ="8388659"/>
+      <!-- Gravity.BOTTOM | Gravity.END -->
+      <enum name="BOTTOM_END" value ="8388693"/>
+      <!-- Gravity.BOTTOM | Gravity.START -->
+      <enum name="BOTTOM_START" value ="8388691"/>
     </attr>
     <!-- Ripple color for the Card. -->
     <attr name="rippleColor"/>