diff --git a/demo/build.gradle.kts b/demo/build.gradle.kts
index e2c64060b..16baebf16 100644
--- a/demo/build.gradle.kts
+++ b/demo/build.gradle.kts
@@ -1,5 +1,5 @@
 /**
- * Copyright 2024 Google Inc.
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,6 +65,7 @@ dependencies {
     implementation(libs.kotlinx.coroutines.android)
     implementation(libs.kotlinx.coroutines.core)
     implementation(libs.material)
+    implementation(libs.core.ktx)
 
     testImplementation(libs.junit)
     testImplementation(libs.truth)
diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
index b1b387dce..fcf52fa22 100644
--- a/demo/src/main/AndroidManifest.xml
+++ b/demo/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?><!--
- Copyright 2024 Google LLC
+ Copyright 2025 Google LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/demo/src/main/java/com/google/maps/android/utils/demo/BaseDemoActivity.java b/demo/src/main/java/com/google/maps/android/utils/demo/BaseDemoActivity.java
index 2281c8dfc..0b780b79b 100644
--- a/demo/src/main/java/com/google/maps/android/utils/demo/BaseDemoActivity.java
+++ b/demo/src/main/java/com/google/maps/android/utils/demo/BaseDemoActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Google Inc.
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import static com.google.maps.android.utils.demo.ApiKeyValidatorKt.hasMapsApiKey;
 
 import android.os.Bundle;
+import android.view.View;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -30,6 +31,11 @@
 
 import java.util.Objects;
 
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
+
 public abstract class BaseDemoActivity extends FragmentActivity implements OnMapReadyCallback {
     private GoogleMap mMap;
     private boolean mIsRestore;
@@ -49,6 +55,30 @@ public void onCreate(Bundle savedInstanceState) {
 
         mIsRestore = savedInstanceState != null;
         setContentView(getLayoutId());
+        // This tells the system that the app will handle drawing behind the system bars.
+        WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
+
+        // This is the root view of my layout.
+        // Make sure to replace R.id.root_layout with the actual ID of your root view.
+        final View rootView = findViewById(android.R.id.content);
+
+        // Add a listener to handle window insets.
+        ViewCompat.setOnApplyWindowInsetsListener(rootView, (view, windowInsets) -> {
+            final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+
+            // Apply the insets as padding to the view.
+            // This will push the content down from behind the status bar and up from
+            // behind the navigation bar.
+            view.setPadding(
+                insets.left,
+                insets.top,
+                insets.right,
+                insets.bottom
+            );
+
+            // Return CONSUMED to signal that we've handled the insets.
+            return WindowInsetsCompat.CONSUMED;
+        });
         setUpMap();
     }
 
@@ -73,4 +103,4 @@ private void setUpMap() {
     protected GoogleMap getMap() {
         return mMap;
     }
-}
+}
\ No newline at end of file
diff --git a/demo/src/main/java/com/google/maps/android/utils/demo/MainActivity.java b/demo/src/main/java/com/google/maps/android/utils/demo/MainActivity.java
index 1d4b866fb..df2579e69 100644
--- a/demo/src/main/java/com/google/maps/android/utils/demo/MainActivity.java
+++ b/demo/src/main/java/com/google/maps/android/utils/demo/MainActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc.
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,11 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
+
 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
     private ViewGroup mListView;
 
@@ -34,6 +39,31 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.main);
 
+        // This tells the system that the app will handle drawing behind the system bars.
+        WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
+
+        // This is the root view of my layout.
+        // Make sure to replace R.id.root_layout with the actual ID of your root view.
+        final View rootView = findViewById(android.R.id.content);
+
+        // Add a listener to handle window insets.
+        ViewCompat.setOnApplyWindowInsetsListener(rootView, (view, windowInsets) -> {
+            final Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+
+            // Apply the insets as padding to the view.
+            // This will push the content down from behind the status bar and up from
+            // behind the navigation bar.
+            view.setPadding(
+                insets.left,
+                insets.top,
+                insets.right,
+                insets.bottom
+            );
+
+            // Return CONSUMED to signal that we've handled the insets.
+            return WindowInsetsCompat.CONSUMED;
+        });
+
         mListView = findViewById(R.id.list);
 
         addDemo("Advanced Markers Clustering Example", CustomAdvancedMarkerClusteringDemoActivity.class);
diff --git a/demo/src/main/res/layout/main.xml b/demo/src/main/res/layout/main.xml
index 6f5acc9c5..e56baabbd 100644
--- a/demo/src/main/res/layout/main.xml
+++ b/demo/src/main/res/layout/main.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2020 Google Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
+  Copyright 2025 Google LLC
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/demo/src/main/res/values-v27/styles.xml b/demo/src/main/res/values-v27/styles.xml
new file mode 100644
index 000000000..d82dbe1c3
--- /dev/null
+++ b/demo/src/main/res/values-v27/styles.xml
@@ -0,0 +1,40 @@
+<!--
+ Copyright 2025 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">
+        <!-- Other theme attributes -->
+
+        <!-- Make status and navigation bars transparent -->
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+
+        <!--
+          Required for edge-to-edge display. This allows the app to draw behind
+          the system bars.
+        -->
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+
+        <!--
+          On API 27+, this allows the app to render in the display cutout area.
+          'shortEdges' is a good default.
+        -->
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+
+</resources>
diff --git a/demo/src/main/res/values/styles.xml b/demo/src/main/res/values/styles.xml
index b26d61819..e6a9deae1 100644
--- a/demo/src/main/res/values/styles.xml
+++ b/demo/src/main/res/values/styles.xml
@@ -1,26 +1,34 @@
 <!--
-  ~ Copyright 2020 Google Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
+ Copyright 2025 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
 -->
+
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+    <style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">
+        <!-- Other theme attributes -->
+
+        <!-- Make status and navigation bars transparent -->
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+
+        <!--
+          Required for edge-to-edge display. This allows the app to draw behind
+          the system bars.
+        -->
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
     </style>
 
 </resources>
diff --git a/library/src/main/java/com/google/maps/android/heatmaps/HeatmapTileProvider.kt b/library/src/main/java/com/google/maps/android/heatmaps/HeatmapTileProvider.kt
index ba172423e..1ee1731e1 100644
--- a/library/src/main/java/com/google/maps/android/heatmaps/HeatmapTileProvider.kt
+++ b/library/src/main/java/com/google/maps/android/heatmaps/HeatmapTileProvider.kt
@@ -138,7 +138,7 @@ class HeatmapTileProvider private constructor(builder: Builder) : TileProvider {
          * @return A new HeatmapTileProvider.
          */
         fun build(): HeatmapTileProvider {
-            check(this.weightedData?.isNotEmpty() == true) { "No input data: you must use either .data or .weightedData before building." }
+            require(this.weightedData?.isNotEmpty() == true) { "No input data: you must use either .data or .weightedData before building." }
             return HeatmapTileProvider(this)
         }
     }
@@ -423,4 +423,4 @@ class HeatmapTileProvider private constructor(builder: Builder) : TileProvider {
             return buckets.values.maxOrNull() ?: 0.0
         }
     }
-}
+}
\ No newline at end of file
diff --git a/library/src/test/java/com/google/maps/android/heatmaps/HeatmapTileProviderTest.kt b/library/src/test/java/com/google/maps/android/heatmaps/HeatmapTileProviderTest.kt
index ccde0afbc..327bbb54e 100644
--- a/library/src/test/java/com/google/maps/android/heatmaps/HeatmapTileProviderTest.kt
+++ b/library/src/test/java/com/google/maps/android/heatmaps/HeatmapTileProviderTest.kt
@@ -46,7 +46,7 @@ class HeatmapTileProviderTest {
         try {
             HeatmapTileProvider.Builder().build()
             fail("Should have thrown IllegalStateException")
-        } catch (e: IllegalStateException) {
+        } catch (_: IllegalArgumentException) {
             // success
         }
     }
@@ -56,7 +56,7 @@ class HeatmapTileProviderTest {
         try {
             HeatmapTileProvider.Builder().data(emptyList())
             fail("Should have thrown IllegalArgumentException")
-        } catch (e: IllegalArgumentException) {
+        } catch (_: IllegalArgumentException) {
             // success
         }
     }
@@ -74,13 +74,13 @@ class HeatmapTileProviderTest {
         try {
             HeatmapTileProvider.Builder().data(data).radius(0)
             fail("Should have thrown IllegalArgumentException")
-        } catch (e: IllegalArgumentException) {
+        } catch (_: IllegalArgumentException) {
             // success
         }
         try {
             HeatmapTileProvider.Builder().data(data).radius(100)
             fail("Should have thrown IllegalArgumentException")
-        } catch (e: IllegalArgumentException) {
+        } catch (_: IllegalArgumentException) {
             // success
         }
     }
@@ -98,13 +98,13 @@ class HeatmapTileProviderTest {
         try {
             HeatmapTileProvider.Builder().data(data).opacity(-1.0)
             fail("Should have thrown IllegalArgumentException")
-        } catch (e: IllegalArgumentException) {
+        } catch (_: IllegalArgumentException) {
             // success
         }
         try {
             HeatmapTileProvider.Builder().data(data).opacity(2.0)
             fail("Should have thrown IllegalArgumentException")
-        } catch (e: IllegalArgumentException) {
+        } catch (_: IllegalArgumentException) {
             // success
         }
     }