Style PWA in recent screen

Author: NotWoods

components/feature/pwa/src/main/java/mozilla/components/feature/pwa/AbstractWebAppShellActivity.kt

@@ -13,6 +13,7 @@ import mozilla.components.concept.engine.Engine
 import mozilla.components.concept.engine.EngineView
 import mozilla.components.concept.engine.manifest.WebAppManifest
 import mozilla.components.feature.pwa.ext.applyOrientation
+import mozilla.components.feature.pwa.ext.asTaskDescription
 import mozilla.components.support.ktx.android.view.enterToImmersiveMode
 
 /**
@@ -51,6 +52,8 @@ abstract class AbstractWebAppShellActivity : AppCompatActivity() {
         }
 
         applyOrientation(manifest)
+
+        setTaskDescription(manifest.asTaskDescription())
     }
 
     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)

components/feature/pwa/src/main/java/mozilla/components/feature/pwa/WebAppLauncherActivity.kt

@@ -62,7 +62,7 @@ class WebAppLauncherActivity : AppCompatActivity() {
     internal fun launchWebAppShell() {
         val intent = Intent()
         intent.action = AbstractWebAppShellActivity.INTENT_ACTION
-        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK
         intent.`package` = packageName
 
         try {

components/feature/pwa/src/main/java/mozilla/components/feature/pwa/ext/WebAppManifest.kt

@@ -0,0 +1,18 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package mozilla.components.feature.pwa.ext
+
+import android.app.ActivityManager.TaskDescription
+import mozilla.components.concept.engine.manifest.WebAppManifest
+
+/**
+ * Create a [TaskDescription] for the activity manager based on the manifest.
+ *
+ * Since the web app icon is provided dynamically by the web site, we can't provide a resource ID.
+ * Instead we use the deprecated constructor.
+ */
+@Suppress("Deprecation")
+fun WebAppManifest.asTaskDescription() =
+    TaskDescription(name, null, themeColor ?: 0)

components/feature/pwa/src/test/java/mozilla/components/feature/pwa/WebAppLauncherActivityTest.kt

@@ -118,7 +118,7 @@ class WebAppLauncherActivityTest {
         verify(activity).startActivity(captor.capture())
 
         assertEquals(AbstractWebAppShellActivity.INTENT_ACTION, captor.value.action)
-        assertEquals(Intent.FLAG_ACTIVITY_NEW_TASK, captor.value.flags)
+        assertEquals(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK, captor.value.flags)
         assertEquals("test", captor.value.`package`)
     }
 }

components/feature/pwa/src/test/java/mozilla/components/feature/pwa/ext/WebAppManifestKtTest.kt

@@ -0,0 +1,40 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package mozilla.components.feature.pwa.ext
+
+import android.graphics.Color.rgb
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import mozilla.components.concept.engine.manifest.WebAppManifest
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class WebAppManifestKtTest {
+
+    @Test
+    fun `should use name as label`() {
+        val taskDescription = WebAppManifest(
+            name = "Demo",
+            startUrl = "https://example.com"
+        ).asTaskDescription()
+        assertEquals("Demo", taskDescription.label)
+        assertNull(taskDescription.icon)
+        assertEquals(0, taskDescription.primaryColor)
+    }
+
+    @Test
+    fun `should use themeColor as primaryColor`() {
+        val taskDescription = WebAppManifest(
+            name = "My App",
+            startUrl = "https://example.com",
+            themeColor = rgb(255, 0, 255)
+        ).asTaskDescription()
+        assertEquals("My App", taskDescription.label)
+        assertNull(taskDescription.icon)
+        assertEquals(rgb(255, 0, 255), taskDescription.primaryColor)
+    }
+}