[Android U] Replaced BuildCompat#isAtLeastU() method calls with explicit SDK checks for UPSIDE_DOWN_CAKE.

afohrman · hunterstich · commit f2e70d2d6688 · 2023-06-14T12:45:51.000-07:00
Before 1.12.0-alpha01 which was released on 6/7, BuildCompat#isAtLeastU() only returns true if API level is greater than 33 and the version running is a pre-release. Two things happened on 6/7 -- the version became a "platform stable" version, and core library version 1.12.0-alpha01 was released, which changes BuildCompat#isAtLeastU() to return true if the version is 34 and stable.

PiperOrigin-RevId: 540304068
diff --git a/catalog/java/io/material/catalog/navigationdrawer/CustomNavigationDrawerDemoActivity.java b/catalog/java/io/material/catalog/navigationdrawer/CustomNavigationDrawerDemoActivity.java
@@ -20,6 +20,7 @@
 
 import android.animation.Animator.AnimatorListener;
 import android.animation.ValueAnimator.AnimatorUpdateListener;
+import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import androidx.appcompat.app.ActionBarDrawerToggle;
@@ -35,7 +36,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
-import androidx.core.os.BuildCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.drawerlayout.widget.DrawerLayout.LayoutParams;
 import androidx.drawerlayout.widget.DrawerLayout.SimpleDrawerListener;
@@ -89,7 +89,7 @@ public void onDrawerOpened(@NonNull View drawerView) {
             currentDrawerView = drawerView;
             sideContainerBackHelper = new MaterialSideContainerBackHelper(drawerView);
 
-            if (BuildCompat.isAtLeastU()) {
+            if (VERSION.SDK_INT >= VERSION_CODES.UPSIDE_DOWN_CAKE) {
               if (drawerOnBackAnimationCallback == null) {
                 drawerOnBackAnimationCallback = createOnBackAnimationCallback();
               }
@@ -111,7 +111,7 @@ public void onDrawerClosed(@NonNull View drawerView) {
             currentDrawerView = null;
             sideContainerBackHelper = null;
 
-            if (BuildCompat.isAtLeastU()) {
+            if (VERSION.SDK_INT >= VERSION_CODES.UPSIDE_DOWN_CAKE) {
               if (drawerOnBackAnimationCallback != null) {
                 getOnBackInvokedDispatcher()
                     .unregisterOnBackInvokedCallback(drawerOnBackAnimationCallback);
diff --git a/lib/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java b/lib/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java
@@ -63,7 +63,6 @@
 import androidx.coordinatorlayout.widget.CoordinatorLayout.LayoutParams;
 import androidx.core.graphics.Insets;
 import androidx.core.math.MathUtils;
-import androidx.core.os.BuildCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
@@ -1610,7 +1609,7 @@ public void handleBackInvoked() {
       return;
     }
     BackEventCompat backEvent = bottomContainerBackHelper.onHandleBackInvoked();
-    if (backEvent == null || !BuildCompat.isAtLeastU()) {
+    if (backEvent == null || VERSION.SDK_INT < VERSION_CODES.UPSIDE_DOWN_CAKE) {
       // If using traditional button system nav or if pre-U, just hide or collapse the bottom sheet.
       setState(hideable ? STATE_HIDDEN : STATE_COLLAPSED);
       return;
diff --git a/lib/java/com/google/android/material/color/ColorContrast.java b/lib/java/com/google/android/material/color/ColorContrast.java
@@ -22,6 +22,7 @@
 import android.app.UiModeManager;
 import android.app.UiModeManager.ContrastChangeListener;
 import android.content.Context;
+import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.view.ContextThemeWrapper;
@@ -30,7 +31,6 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.core.content.ContextCompat;
-import androidx.core.os.BuildCompat;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -134,7 +134,7 @@ public static Context wrapContextIfAvailable(
   /** Returns {@code true} if contrast control is available on the current SDK level. */
   @ChecksSdkIntAtLeast(api = VERSION_CODES.UPSIDE_DOWN_CAKE)
   public static boolean isContrastAvailable() {
-    return BuildCompat.isAtLeastU();
+    return VERSION.SDK_INT >= VERSION_CODES.UPSIDE_DOWN_CAKE;
   }
 
   private static int getContrastThemeOverlayResourceId(
diff --git a/lib/java/com/google/android/material/color/ColorResourcesOverride.java b/lib/java/com/google/android/material/color/ColorResourcesOverride.java
@@ -25,7 +25,6 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.StyleRes;
-import androidx.core.os.BuildCompat;
 import java.util.Map;
 
 /**
@@ -93,7 +92,7 @@ Context wrapContextIfPossible(
   static ColorResourcesOverride getInstance() {
     if (VERSION_CODES.R <= VERSION.SDK_INT && VERSION.SDK_INT <= VERSION_CODES.TIRAMISU) {
       return ResourcesLoaderColorResourcesOverride.getInstance();
-    } else if (BuildCompat.isAtLeastU()) {
+    } else if (VERSION.SDK_INT >= VERSION_CODES.UPSIDE_DOWN_CAKE) {
       // TODO(b/255833419): Replace with FabricatedOverlayColorResourcesOverride() when available
       // for U+.
       return ResourcesLoaderColorResourcesOverride.getInstance();
diff --git a/lib/java/com/google/android/material/color/DynamicColors.java b/lib/java/com/google/android/material/color/DynamicColors.java
@@ -499,7 +499,7 @@ private static boolean shouldOverrideNeutralChroma(@NonNull Context context) {
         MaterialAttributes.resolveBoolean(
             context, R.attr.preUDynamicNeutralChromaUpdateEnabled, /* defaultValue= */ false);
     // Update neutral palette chroma from 4 to 6 for backward compatibility.
-    return !BuildCompat.isAtLeastU()
+    return VERSION.SDK_INT < VERSION_CODES.UPSIDE_DOWN_CAKE
         && VERSION.SDK_INT >= VERSION_CODES.S
         && shouldUpdateNeutralChroma;
   }
@@ -564,6 +564,8 @@ private interface DeviceSupportCondition {
 
   private static float getSystemContrast(Context context) {
     UiModeManager uiModeManager = (UiModeManager) context.getSystemService(Context.UI_MODE_SERVICE);
-    return (uiModeManager == null || !BuildCompat.isAtLeastU()) ? 0 : uiModeManager.getContrast();
+    return (uiModeManager == null || VERSION.SDK_INT < VERSION_CODES.UPSIDE_DOWN_CAKE)
+        ? 0
+        : uiModeManager.getContrast();
   }
 }
diff --git a/lib/java/com/google/android/material/motion/MaterialBackOrchestrator.java b/lib/java/com/google/android/material/motion/MaterialBackOrchestrator.java
@@ -30,7 +30,6 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
-import androidx.core.os.BuildCompat;
 
 /**
  * Utility class for views that support back handling via {@link MaterialBackHandler} which helps
@@ -98,7 +97,7 @@ public void stopListeningForBackCallbacks() {
 
   @Nullable
   private static BackCallbackDelegate createBackCallbackDelegate() {
-    if (BuildCompat.isAtLeastU()) {
+    if (VERSION.SDK_INT >= VERSION_CODES.UPSIDE_DOWN_CAKE) {
       return new Api34BackCallbackDelegate();
     } else if (VERSION.SDK_INT >= VERSION_CODES.TIRAMISU) {
       return new Api33BackCallbackDelegate();
diff --git a/lib/java/com/google/android/material/navigation/NavigationView.java b/lib/java/com/google/android/material/navigation/NavigationView.java
@@ -69,7 +69,6 @@
 import androidx.annotation.StyleRes;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.content.ContextCompat;
-import androidx.core.os.BuildCompat;
 import androidx.core.view.GravityCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
@@ -982,7 +981,7 @@ public void handleBackInvoked() {
     DrawerLayout drawerLayout = drawerLayoutPair.first;
 
     BackEventCompat backEvent = sideContainerBackHelper.onHandleBackInvoked();
-    if (backEvent == null || !BuildCompat.isAtLeastU()) {
+    if (backEvent == null || VERSION.SDK_INT < VERSION_CODES.UPSIDE_DOWN_CAKE) {
       drawerLayout.closeDrawer(this);
       return;
     }
diff --git a/lib/java/com/google/android/material/search/SearchView.java b/lib/java/com/google/android/material/search/SearchView.java
@@ -63,7 +63,6 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.graphics.drawable.DrawableCompat;
-import androidx.core.os.BuildCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.core.widget.TextViewCompat;
@@ -548,7 +547,7 @@ public void setupWithSearchBar(@Nullable SearchBar searchBar) {
     searchViewAnimationHelper.setSearchBar(searchBar);
     if (searchBar != null) {
       searchBar.setOnClickListener(v -> show());
-      if (BuildCompat.isAtLeastU()) {
+      if (VERSION.SDK_INT >= VERSION_CODES.UPSIDE_DOWN_CAKE) {
         try {
           searchBar.setHandwritingDelegatorCallback(this::show);
           editText.setIsHandwritingDelegate(true);
diff --git a/lib/java/com/google/android/material/sidesheet/SideSheetBehavior.java b/lib/java/com/google/android/material/sidesheet/SideSheetBehavior.java
@@ -27,6 +27,8 @@
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.AttributeSet;
@@ -50,7 +52,6 @@
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout.LayoutParams;
 import androidx.core.math.MathUtils;
-import androidx.core.os.BuildCompat;
 import androidx.core.view.GravityCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
@@ -1020,7 +1021,7 @@ public void handleBackInvoked() {
       return;
     }
     BackEventCompat backEvent = sideContainerBackHelper.onHandleBackInvoked();
-    if (backEvent == null || !BuildCompat.isAtLeastU()) {
+    if (backEvent == null || VERSION.SDK_INT < VERSION_CODES.UPSIDE_DOWN_CAKE) {
       setState(STATE_HIDDEN);
       return;
     }

Original file line number	Diff line number	Diff line change
`@@ -499,7 +499,7 @@ private static boolean shouldOverrideNeutralChroma(@NonNull Context context) {`
`499`	`499`	`MaterialAttributes.resolveBoolean(`
`500`	`500`	`context, R.attr.preUDynamicNeutralChromaUpdateEnabled, /* defaultValue= */ false);`
`501`	`501`	`// Update neutral palette chroma from 4 to 6 for backward compatibility.`
`502`		`- return !BuildCompat.isAtLeastU()`
	`502`	`+ return VERSION.SDK_INT < VERSION_CODES.UPSIDE_DOWN_CAKE`
`503`	`503`	`&& VERSION.SDK_INT >= VERSION_CODES.S`
`504`	`504`	`&& shouldUpdateNeutralChroma;`
`505`	`505`	`}`
`@@ -564,6 +564,8 @@ private interface DeviceSupportCondition {`
`564`	`564`
`565`	`565`	`private static float getSystemContrast(Context context) {`
`566`	`566`	`UiModeManager uiModeManager = (UiModeManager) context.getSystemService(Context.UI_MODE_SERVICE);`
`567`		`- return (uiModeManager == null \|\| !BuildCompat.isAtLeastU()) ? 0 : uiModeManager.getContrast();`
	`567`	`+ return (uiModeManager == null \|\| VERSION.SDK_INT < VERSION_CODES.UPSIDE_DOWN_CAKE)`
	`568`	`+ ? 0`
	`569`	`+ : uiModeManager.getContrast();`
`568`	`570`	`}`
`569`	`571`	`}`