diff --git a/lib/java/com/google/android/material/sidesheet/RightSheetDelegate.java b/lib/java/com/google/android/material/sidesheet/RightSheetDelegate.java index bcc514e21..152d75319 100644 --- a/lib/java/com/google/android/material/sidesheet/RightSheetDelegate.java +++ b/lib/java/com/google/android/material/sidesheet/RightSheetDelegate.java @@ -44,7 +44,7 @@ final class RightSheetDelegate extends SheetDelegate { @SheetEdge @Override int getSheetEdge() { - return SideSheetBehavior.RIGHT; + return SideSheetBehavior.EDGE_RIGHT; } /** Returns the sheet's offset in pixels from the origin edge when hidden. */ diff --git a/lib/java/com/google/android/material/sidesheet/Sheet.java b/lib/java/com/google/android/material/sidesheet/Sheet.java index 64faf3b4d..cd2c099b6 100644 --- a/lib/java/com/google/android/material/sidesheet/Sheet.java +++ b/lib/java/com/google/android/material/sidesheet/Sheet.java @@ -66,8 +66,11 @@ interface Sheet { @Retention(RetentionPolicy.SOURCE) @interface StableSheetState {} - /** The sheet is based on the right edge; it slides from the right edge towards the left. */ - int RIGHT = 0; + /** + * The sheet is based on the right edge of the screen; it slides from the right edge towards the + * left. + */ + int EDGE_RIGHT = 0; /** * The edge of the screen that a sheet slides out of. @@ -75,7 +78,7 @@ interface Sheet { * @hide */ @RestrictTo(LIBRARY_GROUP) - @IntDef({RIGHT}) + @IntDef({EDGE_RIGHT}) @Retention(RetentionPolicy.SOURCE) @interface SheetEdge {} diff --git a/lib/java/com/google/android/material/sidesheet/SideSheetBehavior.java b/lib/java/com/google/android/material/sidesheet/SideSheetBehavior.java index b4ad42833..6fb430761 100644 --- a/lib/java/com/google/android/material/sidesheet/SideSheetBehavior.java +++ b/lib/java/com/google/android/material/sidesheet/SideSheetBehavior.java @@ -158,19 +158,19 @@ public class SideSheetBehavior extends CoordinatorLayout.Behavio private void setSheetEdge(@SheetEdge int sheetEdge) { if (sheetDelegate == null || sheetDelegate.getSheetEdge() != sheetEdge) { - if (sheetEdge == RIGHT) { + if (sheetEdge == EDGE_RIGHT) { this.sheetDelegate = new RightSheetDelegate(this); return; } throw new IllegalArgumentException( - "Invalid sheet edge position value: " + sheetEdge + ". Must be " + RIGHT); + "Invalid sheet edge position value: " + sheetEdge + ". Must be " + EDGE_RIGHT); } } @SheetEdge private int getDefaultSheetEdge() { - return RIGHT; + return EDGE_RIGHT; } /**