Merge pull request #932 from GoogleChromeLabs/launch_handler_client_mode

Store launch_handler clinet_mode to AndroidManifest

Author: SelyvonSerhii

packages/cli/README.md

@@ -394,6 +394,7 @@ Fields:
 |minSdkVersion|number|false|The minimum [Android API Level](https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels) required for the application to run. Defaults to `23`, if `isMetaQuest` is `true`, and `19` otherwise.|
 |protocolHandlers|[ProtocolHandler](#protocolhandlers)[]|false|List of [Protocol Handlers](#protocolhandlers) supported by the app.|
 |fileHandlers|[FileHandler](#fileHandlers)[]|false|List of [File Hanlders](#fileHandlers) supported by the app.|
+|launchHandlerClientMode|string|false|launch_handler [client_mode](https://developer.mozilla.org/en-US/docs/Web/Progressive_web_apps/Manifest/Reference/launch_handler#client_mode) of the app.|
 
 ### Features
 
@@ -483,6 +484,10 @@ List of File Handlers registered for the application. These entries may not exac
 |actionUrl|string|true|URL to be navigated to in case of file handler launch matching the according MIME types|
 |mimeTypes|string[]|true|The list of MIME types for the file handler|
 
+### LaunchHandler
+A string, which specifies the context in which the app should be loaded when launched. Possible values are: "auto", "focus-existing", "navigate-existing", "navigate-new".
+See [launch_handler](https://developer.mozilla.org/en-US/docs/Web/Progressive_web_apps/Manifest/Reference/launch_handler) for more information.
+
 
 ## Manually setting up the Environment
 

packages/core/src/lib/TwaManifest.ts

@@ -173,6 +173,7 @@ export class TwaManifest {
   retainedBundles: number[];
   protocolHandlers?: ProtocolHandler[];
   fileHandlers?: FileHandler[];
+  launchHandlerClientMode?: string;
 
   private static log = new ConsoleLog('twa-manifest');
 
@@ -225,6 +226,7 @@ export class TwaManifest {
     this.retainedBundles = data.retainedBundles || [];
     this.protocolHandlers = data.protocolHandlers;
     this.fileHandlers = data.fileHandlers;
+    this.launchHandlerClientMode = data.launchHandlerClientMode;
   }
 
   /**
@@ -363,6 +365,7 @@ export class TwaManifest {
       fullScopeUrl: fullScopeUrl.toString(),
       protocolHandlers: processedProtocolHandlers,
       fileHandlers,
+      launchHandlerClientMode: webManifest['launch_handler']?.['client_mode'] || '',
     });
     return twaManifest;
   }
@@ -550,6 +553,9 @@ export class TwaManifest {
       shortcuts: shortcuts,
       protocolHandlers: protocolHandlers,
       fileHandlers,
+      launchHandlerClientMode: this.getNewFieldValue('launchHandlerClientMode', fieldsToIgnore,
+          oldTwaManifest.launchHandlerClientMode,
+          webManifest['launch_handler']?.['client_mode'] || ''),
     });
     return twaManifest;
   }
@@ -607,6 +613,7 @@ export interface TwaManifestJson {
   retainedBundles?: number[];
   protocolHandlers?: ProtocolHandler[];
   fileHandlers?: FileHandler[];
+  launchHandlerClientMode?: string;
 }
 
 export interface SigningKeyInfo {

packages/core/src/lib/types/WebManifest.ts

@@ -72,4 +72,7 @@ export interface WebManifestJson {
   orientation?: OrientationLock;
   protocol_handlers?: Array<ProtocolHandler>;
   file_handlers?: Array<FileHandlerJson>;
+  launch_handler?: {
+    client_mode?: string;
+  };
 }

packages/core/src/spec/lib/TwaManifestSpec.ts

@@ -381,6 +381,7 @@ describe('TwaManifest', () => {
       };
       const twaManifest = new TwaManifest({
         'packageId': 'id',
+        'launchHandlerClientMode': 'navigate_existing',
         'host': 'host',
         'name': 'name',
         'launcherName': 'name',
@@ -472,6 +473,7 @@ describe('TwaManifest', () => {
       };
       const twaManifest = new TwaManifest({
         'packageId': 'id',
+        'launchHandlerClientMode': 'navigate_existing',
         'host': 'host',
         'name': 'name',
         'launcherName': 'name',

packages/core/template_project/app/build.gradle

@@ -70,6 +70,10 @@ android {
         def launchUrl = "https://" + twaManifest.hostName + twaManifest.launchUrl
         resValue "string", "launchUrl", launchUrl
 
+        <% if (launchHandlerClientMode) { %>
+            resValue "string", "launchHandlerClientMode", '<%= launchHandlerClientMode %>'
+        <% } %>
+
         <% if (webManifestUrl) { %>
             // The URL the Web Manifest for the Progressive Web App that the TWA points to. This
             // is used by Chrome OS and Meta Quest to open the Web version of the PWA instead of

packages/core/template_project/app/src/main/AndroidManifest.xml

@@ -109,6 +109,12 @@
                 android:name="android.support.customtabs.trusted.STATUS_BAR_COLOR"
                 android:resource="@color/colorPrimary" />
 
+            <% if (launchHandlerClientMode) { %>
+                <meta-data
+                    android:name="android.support.customtabs.trusted.LAUNCH_HANDLER_CLIENT_MODE"
+                    android:value="@string/launchHandlerClientMode" />
+            <% } %>
+
             <meta-data
                 android:name="android.support.customtabs.trusted.STATUS_BAR_COLOR_DARK"
                 android:resource="@color/colorPrimaryDark" />