Canonical Layouts appear first in appwidgets demo, Canonical layout activity uses own task affinity

Author: secondsun

samples/user-interface/appwidgets/src/main/AndroidManifest.xml

@@ -41,6 +41,8 @@
         <activity
             android:label="Canonical Layouts"
             android:name=".glance.layout.MainActivity"
+            android:clearTaskOnLaunch="true"
+            android:taskAffinity="com.example.platform.canonicallayout"
             android:exported="true"
             android:theme="@style/Theme.LayoutSamples">
             <intent-filter>

samples/user-interface/appwidgets/src/main/java/com/example/platform/ui/appwidgets/AppWidgets.kt

@@ -56,9 +56,19 @@ import com.google.android.catalog.framework.annotations.Sample
 fun AppWidgets() {
     val context = LocalContext.current
     val widgetManager = AppWidgetManager.getInstance(context)
+
     // Get a list of our app widget providers to retrieve their info
     val widgetProviders = widgetManager.getInstalledProvidersForPackage(context.packageName, null)
+        .showCanonicalLayoutsFirst()
+
+    AppWidgetsList(widgetProviders)
+}
 
+@RequiresApi(Build.VERSION_CODES.O)
+@Composable
+fun AppWidgetsList(widgetProviders: List<AppWidgetProviderInfo>) {
+    val context = LocalContext.current
+    val widgetManager = AppWidgetManager.getInstance(context)
     LazyColumn(contentPadding = PaddingValues(16.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
         item {
             AppInfoText()
@@ -77,6 +87,16 @@ fun AppWidgets() {
     }
 }
 
+private fun MutableList<AppWidgetProviderInfo>.showCanonicalLayoutsFirst(): List<AppWidgetProviderInfo> {
+    return this.toMutableList().apply {
+        sortWith (
+            compareBy {
+                if (it.provider.className.startsWith("com.example.platform.ui.appwidgets.glance.layout")) -1 else 1
+            }
+        )
+    }
+}
+
 
 /**
  * Extension method to request the launcher to pin the given AppWidgetProviderInfo

samples/user-interface/appwidgets/src/main/java/com/example/platform/ui/appwidgets/glance/layout/MainActivity.kt

@@ -3,9 +3,11 @@ package com.example.platform.ui.appwidgets.glance.layout
 import android.appwidget.AppWidgetManager
 import android.appwidget.AppWidgetProviderInfo
 import android.content.Context
+import android.os.Build
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.annotation.RequiresApi
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -29,13 +31,15 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.glance.appwidget.GlanceAppWidgetManager
 import androidx.glance.appwidget.GlanceAppWidgetReceiver
+import com.example.platform.ui.appwidgets.AppWidgetsList
 import com.example.platform.ui.appwidgets.glance.layout.ui.theme.LayoutSamplesTheme
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
 val TAG = "layoutsamples"
 
 class MainActivity : ComponentActivity() {
+    @RequiresApi(Build.VERSION_CODES.O)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -44,16 +48,7 @@ class MainActivity : ComponentActivity() {
         setContent {
             val scope = rememberCoroutineScope()
             LayoutSamplesTheme {
-                LazyColumn(Modifier.fillMaxSize(), contentPadding = PaddingValues(8.dp)) {
-                    item {
-                        AppDescription()
-                    }
-                    items(ourWidgets) { providerInfo: AppWidgetProviderInfo ->
-                        WidgetRow(
-                            providerInfo = providerInfo,
-                            onClick = { requestPin(providerInfo, this@MainActivity, scope) })
-                    }
-                }
+                AppWidgetsList(widgetProviders = ourWidgets)
             }
         }
     }
@@ -62,7 +57,7 @@ class MainActivity : ComponentActivity() {
 private fun Context.ourWidgets(): List<AppWidgetProviderInfo> {
     val appWidgetManager = AppWidgetManager.getInstance(this)
     return appWidgetManager.installedProviders
-        .filter { providerInfo: AppWidgetProviderInfo -> providerInfo.provider.packageName == packageName }
+        .filter { it.provider.className.startsWith("com.example.platform.ui.appwidgets.glance.layout") }
 }
 
 @Composable