Gate ProgressStyle sample on SDK 36+

Author: alabiaga

app/src/main/java/com/example/platform/app/SampleDemo.kt

@@ -111,7 +111,7 @@ import com.example.platform.ui.haptics.Resist
 import com.example.platform.ui.haptics.Wobble
 import com.example.platform.ui.insets.ImmersiveMode
 import com.example.platform.ui.insets.WindowInsetsAnimationActivity
-import com.example.platform.ui.live_updates.LiveUpdateActivity
+import com.example.platform.ui.live_updates.LiveUpdateSample
 import com.example.platform.ui.predictiveback.PBHostingActivity
 import com.example.platform.ui.quicksettings.QuickSettings
 import com.example.platform.ui.share.receiver.ShareReceiverActivity
@@ -994,13 +994,19 @@ val SAMPLE_DEMOS by lazy {
             tags = listOf("Haptics"),
             content = { Wobble() }
         ),
-        ActivitySampleDemo(
+        ComposableSampleDemo(
             id = "live-updates",
             name = "Live Updates - ProgressStyle implementation",
             description = "Usage of ProgressStyle with Live update treatment",
             documentation = "https://developer.android.com/about/versions/16/features/progress-centric-notifications",
+            minSdk = Build.VERSION_CODES.BAKLAVA,
             apiSurface = UserInterfaceLiveUpdatesApiSurface,
-            content = LiveUpdateActivity::class.java
+            content = {
+                MinSdkBox(minSdk = Build.VERSION_CODES.BAKLAVA) {
+                    //noinspection NewApi
+                    LiveUpdateSample()
+                }
+            },
         ),
         ActivitySampleDemo(
             id = "picture-in-picture-video-playback",

samples/user-interface/live-updates/src/main/AndroidManifest.xml

@@ -19,11 +19,4 @@
 
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
-    <application>
-        <activity
-            android:name=".LiveUpdateActivity"
-            android:exported="true">
-        </activity>
-    </application>
-
 </manifest>

samples/user-interface/live-updates/src/main/java/com/example/platform/ui/live_updates/LiveUpdateActivity.kt renamed to samples/user-interface/live-updates/src/main/java/com/example/platform/ui/live_updates/LiveUpdateSample.kt

@@ -3,10 +3,6 @@ package com.example.platform.ui.live_updates
 import android.annotation.SuppressLint
 import android.app.NotificationManager
 import android.content.Context
-import android.os.Bundle
-import androidx.activity.enableEdgeToEdge
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -25,6 +21,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
@@ -33,21 +30,11 @@ import com.google.accompanist.permissions.rememberPermissionState
 import com.google.accompanist.permissions.shouldShowRationale
 import kotlinx.coroutines.launch
 
-class LiveUpdateActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
-        val notificationManager =
-            this.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        SnackbarNotificationManager.initialize(this, notificationManager)
-        setContent {
-            Initialize()
-        }
-    }
-}
-
 @Composable
-fun Initialize() {
+fun LiveUpdateSample() {
+    val notificationManager =
+        LocalContext.current.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+    SnackbarNotificationManager.initialize(LocalContext.current.applicationContext, notificationManager)
     val scope = rememberCoroutineScope()
     val snackbarHostState = remember { SnackbarHostState() }
     Scaffold(

samples/user-interface/live-updates/src/main/java/com/example/platform/ui/live_updates/SnackbarNotificationManager.kt

@@ -28,7 +28,6 @@ import android.os.Handler
 import android.os.Looper
 import androidx.annotation.RequiresApi
 import androidx.core.graphics.drawable.IconCompat
-import com.example.platform.ui.live_updates.R
 
 object SnackbarNotificationManager {
     private lateinit var notificationManager: NotificationManager
@@ -38,11 +37,12 @@ object SnackbarNotificationManager {
     private const val NOTIFICATION_ID = 1234
 
 
+    @RequiresApi(Build.VERSION_CODES.O)
     fun initialize(context: Context, notifManager: NotificationManager) {
         notificationManager = notifManager
         val channel = NotificationChannel(CHANNEL_ID, CHANNEL_NAME, IMPORTANCE_DEFAULT)
         appContext = context
-        notificationManager?.createNotificationChannel(channel)
+        notificationManager.createNotificationChannel(channel)
     }
 
     private enum class OrderState(val delay: Long) {
@@ -186,6 +186,7 @@ object SnackbarNotificationManager {
             return progressStyle
         }
 
+        @RequiresApi(Build.VERSION_CODES.O)
         fun buildBaseNotification(appContext: Context, orderState: OrderState): Notification.Builder {
             var notificationBuilder = Notification.Builder(appContext, CHANNEL_ID)
                 .setSmallIcon(R.drawable.ic_launcher_foreground)