diff --git a/views/build.gradle.kts b/views/build.gradle.kts index 80ee4edc8..89f5a6f38 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 = 35 defaultConfig { @@ -48,6 +48,8 @@ android { dependencies { + implementation("androidx.core:core:1.13.1") + implementation("androidx.appcompat:appcompat:1.6.1") implementation(libs.androidx.core.ktx) implementation(libs.androidx.appcompat) implementation(libs.google.android.material) 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. --> - + + + + + + + + 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 @@ + + + + + + diff --git a/watchfacepush/validator/build.gradle.kts b/watchfacepush/validator/build.gradle.kts index 0b9289a5c..23e6aa585 100644 --- a/watchfacepush/validator/build.gradle.kts +++ b/watchfacepush/validator/build.gradle.kts @@ -22,6 +22,10 @@ plugins { application } +kotlin { + jvmToolchain(17) +} + application { mainClass.set("com.example.validator.Main") } diff --git a/xr/build.gradle.kts b/xr/build.gradle.kts index 51c224f20..b48c93479 100644 --- a/xr/build.gradle.kts +++ b/xr/build.gradle.kts @@ -16,11 +16,11 @@ android { versionName = "1.0" } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } buildFeatures { compose = true