diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0d03a91a0..df371f765 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,6 +11,7 @@ androidx-compose-ui-test-junit4-accessibility = "1.10.0-alpha04"
 androidx-constraintlayout = "2.2.1"
 androidx-constraintlayout-compose = "1.1.1"
 androidx-coordinator-layout = "1.3.0"
+androidx-core = "1.13.1"
 androidx-corektx = "1.17.0"
 androidx-credentials = "1.5.0"
 androidx-credentials-play-services-auth = "1.5.0"
@@ -32,7 +33,6 @@ androidx-xr-arcore = "1.0.0-alpha06"
 androidx-xr-compose = "1.0.0-alpha07"
 androidx-xr-scenecore = "1.0.0-alpha07"
 androidxHiltNavigationCompose = "1.3.0"
-appcompat = "1.7.1"
 coil = "2.7.0"
 # @keep
 compileSdk = "36"
@@ -118,6 +118,7 @@ androidx-compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" }
 androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-constraintlayout-compose" }
 androidx-coordinator-layout = { module = "androidx.coordinatorlayout:coordinatorlayout", version.ref = "androidx-coordinator-layout" }
+androidx-core = { module = "androidx.core:core", version.ref = "androidx-core" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-corektx" }
 androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "coreSplashscreen" }
 androidx-credentials = { module = "androidx.credentials:credentials", version.ref = "androidx-credentials" }
@@ -169,7 +170,6 @@ androidx-work-runtime-ktx = "androidx.work:work-runtime-ktx:2.10.5"
 androidx-xr-arcore = { module = "androidx.xr.arcore:arcore", version.ref = "androidx-xr-arcore" }
 androidx-xr-compose = { module = "androidx.xr.compose:compose", version.ref = "androidx-xr-compose" }
 androidx-xr-scenecore = { module = "androidx.xr.scenecore:scenecore", version.ref = "androidx-xr-scenecore" }
-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 coil-kt-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
 compose-foundation = { module = "androidx.wear.compose:compose-foundation", version.ref = "wearComposeFoundation" }
 compose-ui-tooling = { module = "androidx.wear.compose:compose-ui-tooling", version.ref = "composeUiTooling" }
diff --git a/identity/credentialmanager/build.gradle.kts b/identity/credentialmanager/build.gradle.kts
index 2e35608a7..b56072c7b 100644
--- a/identity/credentialmanager/build.gradle.kts
+++ b/identity/credentialmanager/build.gradle.kts
@@ -77,7 +77,7 @@ dependencies {
     implementation(libs.okhttp)
     implementation(libs.kotlin.coroutines.okhttp)
     implementation(libs.androidx.webkit)
-    implementation(libs.appcompat)
+    implementation(libs.androidx.appcompat)
     debugImplementation(libs.androidx.compose.ui.tooling)
     debugImplementation(libs.androidx.compose.ui.test.manifest)
 }
diff --git a/misc/build.gradle.kts b/misc/build.gradle.kts
index cb0905420..bfe0e41d5 100644
--- a/misc/build.gradle.kts
+++ b/misc/build.gradle.kts
@@ -71,7 +71,7 @@ dependencies {
     implementation(libs.androidx.window)
     implementation(libs.androidx.startup.runtime)
     implementation(libs.androidx.window.java)
-    implementation(libs.appcompat)
+    implementation(libs.androidx.appcompat)
     testImplementation(libs.junit)
     testImplementation(kotlin("test"))
     androidTestImplementation(libs.androidx.test.ext.junit)
diff --git a/views/build.gradle.kts b/views/build.gradle.kts
index 623add7ab..b85e66517 100644
--- a/views/build.gradle.kts
+++ b/views/build.gradle.kts
@@ -18,7 +18,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.example.snippet.views"
+    namespace = "com.example.android.views"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
@@ -48,8 +48,9 @@ android {
 
 dependencies {
 
-    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.core)
     implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.core.ktx)
     implementation(libs.google.android.material)
     implementation(libs.androidx.glance.appwidget)
 
diff --git a/views/src/main/AndroidManifest.xml b/views/src/main/AndroidManifest.xml
index cb8f943f4..ce26f961d 100644
--- a/views/src/main/AndroidManifest.xml
+++ b/views/src/main/AndroidManifest.xml
@@ -15,5 +15,13 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
+    <application>
+        <activity android:name=".notifications.NotificationSnippets$MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
 </manifest>
diff --git a/views/src/main/java/com/example/android/views/notifications/NotificationSnippets.java b/views/src/main/java/com/example/android/views/notifications/NotificationSnippets.java
new file mode 100644
index 000000000..17606bdd2
--- /dev/null
+++ b/views/src/main/java/com/example/android/views/notifications/NotificationSnippets.java
@@ -0,0 +1,26 @@
+package com.example.android.views.notifications;
+
+import android.app.Activity;
+import android.os.Bundle;
+import androidx.core.app.NotificationCompat;
+import com.example.android.views.R;
+
+public class NotificationSnippets {
+    private static final String CHANNEL_ID = "channel_id";
+    private static final String textTitle = "Notification Title";
+    private static final String textContent = "Notification Content";
+
+    public static class MainActivity extends Activity {
+        @Override
+        protected void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            // [START android_views_notifications_build_basic]
+            NotificationCompat.Builder builder = new NotificationCompat.Builder(this, CHANNEL_ID)
+                    .setSmallIcon(R.drawable.notification_icon)
+                    .setContentTitle(textTitle)
+                    .setContentText(textContent)
+                    .setPriority(NotificationCompat.PRIORITY_DEFAULT);
+            // [END android_views_notifications_build_basic]
+        }
+    }
+}
diff --git a/views/src/main/java/com/example/example/snippet/views/appwidget/AppWidgetSnippets.kt b/views/src/main/java/com/example/example/snippet/views/appwidget/AppWidgetSnippets.kt
index 0499d116a..08ac4f649 100644
--- a/views/src/main/java/com/example/example/snippet/views/appwidget/AppWidgetSnippets.kt
+++ b/views/src/main/java/com/example/example/snippet/views/appwidget/AppWidgetSnippets.kt
@@ -25,7 +25,7 @@ import android.widget.RemoteViews
 import androidx.glance.GlanceId
 import androidx.glance.appwidget.GlanceAppWidget
 import androidx.glance.appwidget.compose
-import com.example.example.snippet.views.R
+import com.example.android.views.R
 
 class ExampleAppWidget : GlanceAppWidget() {
     override suspend fun provideGlance(context: Context, id: GlanceId) {
diff --git a/views/src/main/java/insets/SystemBarProtectionSnippet.kt b/views/src/main/java/insets/SystemBarProtectionSnippet.kt
index c21011b44..8003e35f5 100644
--- a/views/src/main/java/insets/SystemBarProtectionSnippet.kt
+++ b/views/src/main/java/insets/SystemBarProtectionSnippet.kt
@@ -25,7 +25,7 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.insets.GradientProtection
 import androidx.core.view.insets.ProtectionLayout
-import com.example.example.snippet.views.R
+import com.example.android.views.R
 
 class SystemBarProtectionSnippet : AppCompatActivity() {
 
diff --git a/views/src/main/res/drawable/notification_icon.xml b/views/src/main/res/drawable/notification_icon.xml
new file mode 100644
index 000000000..316a91edb
--- /dev/null
+++ b/views/src/main/res/drawable/notification_icon.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright 2025 The Android Open Source Project
+
+     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
+
+          https://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.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FF0000" />
+    <size android:width="24dp"
+        android:height="24dp" />
+</shape>
diff --git a/watchfacepush/validator/build.gradle.kts b/watchfacepush/validator/build.gradle.kts
index 7cfb5372d..b8608210a 100644
--- a/watchfacepush/validator/build.gradle.kts
+++ b/watchfacepush/validator/build.gradle.kts
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import org.gradle.jvm.toolchain.JavaLanguageVersion
 
 group = "com.example.validator"
 version = "1.0"
@@ -34,7 +33,6 @@ kotlin {
 }
 application {
     mainClass.set("com.example.validator.Main")
-
 }
 
 sourceSets {
@@ -43,9 +41,8 @@ sourceSets {
             srcDir("src/main/java")
         }
     }
-
 }
 
 dependencies {
     implementation(libs.validator.push)
-}
+}
\ No newline at end of file