[fidldoc] Updating fidldocs
diff --git a/sdk/fidl/fuchsia.modular/README.md b/sdk/fidl/fuchsia.modular/README.md
index 45862f1..cbb36f5 100644
--- a/sdk/fidl/fuchsia.modular/README.md
+++ b/sdk/fidl/fuchsia.modular/README.md
@@ -1249,7 +1249,7 @@
<tr>
<td><code>story_info</code></td>
<td>
- <code><a class='link' href='#StoryInfo'>StoryInfo</a></code>
+ <code><a class='link' href='#StoryInfo'>StoryInfo</a>?</code>
</td>
</tr></table>
@@ -1477,15 +1477,30 @@
+### AddSurface2 {#AddSurface2}
+
+<p>DEPRECATED. For transition purposes only.</p>
+
+#### Request
+<table>
+ <tr><th>Name</th><th>Type</th></tr>
+ <tr>
+ <td><code>view_connection</code></td>
+ <td>
+ <code><a class='link' href='#ViewConnection2'>ViewConnection2</a></code>
+ </td>
+ </tr><tr>
+ <td><code>surface_info</code></td>
+ <td>
+ <code><a class='link' href='#SurfaceInfo'>SurfaceInfo</a></code>
+ </td>
+ </tr></table>
+
+
+
### AddSurface3 {#AddSurface3}
-<p>Adds a new Surface and its corresponding view to be displayed by the
-StoryShell. More context that allows the story shell to decide how
-to layout will be added later. Also, interface to influence life cycle and
-focus is obviously missing.
-<code>view_connection</code> the new view and the associated Surface ID.
-<code>surface_info</code> metadata relating to the Surface.
-For transition purposes only.</p>
+<p>For transition purposes only.</p>
#### Request
<table>
@@ -1578,7 +1593,7 @@
-### UpdateSurface3 {#UpdateSurface3}
+### UpdateSurface {#UpdateSurface}
<p>Update the surface
This is called when the intent is to update the surface metadata in the
@@ -1586,8 +1601,49 @@
updated. If no value or null is passed for a field it remains unchanged.
This includes the <code>view_holder_token</code> inside the connection.</p>
<p>E.g called when an intent resolves to a module that is known by the
-caller to already be running, to update associated metadata.
-For transition purposes only.</p>
+caller to already be running, to update associated metadata.</p>
+
+#### Request
+<table>
+ <tr><th>Name</th><th>Type</th></tr>
+ <tr>
+ <td><code>view_connection</code></td>
+ <td>
+ <code><a class='link' href='#ViewConnection'>ViewConnection</a></code>
+ </td>
+ </tr><tr>
+ <td><code>surface_info</code></td>
+ <td>
+ <code><a class='link' href='#SurfaceInfo'>SurfaceInfo</a></code>
+ </td>
+ </tr></table>
+
+
+
+### UpdateSurface2 {#UpdateSurface2}
+
+<p>DEPRECATED. For transition purposes only.</p>
+
+#### Request
+<table>
+ <tr><th>Name</th><th>Type</th></tr>
+ <tr>
+ <td><code>view_connection</code></td>
+ <td>
+ <code><a class='link' href='#ViewConnection2'>ViewConnection2</a></code>
+ </td>
+ </tr><tr>
+ <td><code>surface_info</code></td>
+ <td>
+ <code><a class='link' href='#SurfaceInfo'>SurfaceInfo</a></code>
+ </td>
+ </tr></table>
+
+
+
+### UpdateSurface3 {#UpdateSurface3}
+
+<p>For transition purposes only.</p>
#### Request
<table>
@@ -1607,7 +1663,7 @@
## StoryShellContext {#StoryShellContext}
-*Defined in [fuchsia.modular/story_shell.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_shell.fidl#144)*
+*Defined in [fuchsia.modular/story_shell.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_shell.fidl#138)*
<p>This interface provides the StoryShell instance with everything it needs to
know or be able to do about the Story. Not much right now, but we expect this
@@ -1665,7 +1721,7 @@
## StoryVisualStateWatcher {#StoryVisualStateWatcher}
-*Defined in [fuchsia.modular/story_shell.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_shell.fidl#159)*
+*Defined in [fuchsia.modular/story_shell.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_shell.fidl#153)*
<p>Implemented by StoryShell to get notified about visual state changes.</p>
@@ -2373,8 +2429,54 @@
<tr><th>Name</th><th>Type</th><th>Description</th><th>Default</th></tr>
</table>
+### StoryInfo {#StoryInfo}
+*Defined in [fuchsia.modular/story_info.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_info.fidl#8)*
+
+<p>Information about a story as provided to the SessionShell.</p>
+
+
+<table>
+ <tr><th>Name</th><th>Type</th><th>Description</th><th>Default</th></tr><tr>
+ <td><code>url</code></td>
+ <td>
+ <code>string?</code>
+ </td>
+ <td><p>URL of the first module run in this story. This module is free to
+run more modules in the story. Used for display purposes only.</p>
+</td>
+ <td>No default</td>
+ </tr><tr>
+ <td><code>id</code></td>
+ <td>
+ <code>string</code>
+ </td>
+ <td><p>The ID of the Story, used to reference it in method arguments.</p>
+</td>
+ <td>No default</td>
+ </tr><tr>
+ <td><code>last_focus_time</code></td>
+ <td>
+ <code>int64</code>
+ </td>
+ <td><p>Wallclock time when the story was last focused. From
+<code>ZX_CLOCK_UTC</code>, thus nanoseconds since UNIX epoch (1970-01-01 00:00 UTC).</p>
+<p>A value of zero means the story has never been focused.</p>
+</td>
+ <td>No default</td>
+ </tr><tr>
+ <td><code>extra</code></td>
+ <td>
+ <code>vector<<a class='link' href='#StoryInfoExtraEntry'>StoryInfoExtraEntry</a>>?</code>
+ </td>
+ <td><p>Data the SessionShell wants to keep associated with this Story, like
+title, a color, or a display rank.</p>
+</td>
+ <td>No default</td>
+ </tr>
+</table>
+
### StoryInfoExtraEntry {#StoryInfoExtraEntry}
-*Defined in [fuchsia.modular/story_info.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_info.fidl#44)*
+*Defined in [fuchsia.modular/story_info.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_info.fidl#47)*
@@ -2415,7 +2517,7 @@
</table>
### ViewConnection {#ViewConnection}
-*Defined in [fuchsia.modular/story_shell.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_shell.fidl#74)*
+*Defined in [fuchsia.modular/story_shell.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_shell.fidl#76)*
<p>A pair mapping a surface ID to a view (via <code>view_holder_token</code>).</p>
@@ -2441,7 +2543,7 @@
</table>
### ViewConnection2 {#ViewConnection2}
-*Defined in [fuchsia.modular/story_shell.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_shell.fidl#83)*
+*Defined in [fuchsia.modular/story_shell.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_shell.fidl#85)*
<p>DEPRECATED, for transition purposes only.</p>
@@ -2466,6 +2568,50 @@
</tr>
</table>
+### SurfaceInfo {#SurfaceInfo}
+*Defined in [fuchsia.modular/story_shell.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_shell.fidl#94)*
+
+<p>Contains metadata for a Surface.</p>
+
+
+<table>
+ <tr><th>Name</th><th>Type</th><th>Description</th><th>Default</th></tr><tr>
+ <td><code>parent_id</code></td>
+ <td>
+ <code>string</code>
+ </td>
+ <td><p>ID of the view that is parent of this Surface.</p>
+</td>
+ <td>No default</td>
+ </tr><tr>
+ <td><code>surface_relation</code></td>
+ <td>
+ <code><a class='link' href='#SurfaceRelation'>SurfaceRelation</a>?</code>
+ </td>
+ <td><p>The relationship between the parent Surface and this new Surface. Used
+for layout optimization.</p>
+</td>
+ <td>No default</td>
+ </tr><tr>
+ <td><code>module_manifest</code></td>
+ <td>
+ <code><a class='link' href='#ModuleManifest'>ModuleManifest</a>?</code>
+ </td>
+ <td><p>Information about the module populates the view.</p>
+</td>
+ <td>No default</td>
+ </tr><tr>
+ <td><code>module_source</code></td>
+ <td>
+ <code><a class='link' href='#ModuleSource'>ModuleSource</a></code>
+ </td>
+ <td><p>How the Surface was generated. By an action internal to the story or by
+an external action.</p>
+</td>
+ <td>No default</td>
+ </tr>
+</table>
+
### SurfaceRelation {#SurfaceRelation}
*Defined in [fuchsia.modular/surface.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/surface/surface.fidl#11)*
@@ -2697,7 +2843,7 @@
### StoryVisualState {#StoryVisualState}
Type: <code>uint32</code>
-*Defined in [fuchsia.modular/story_shell.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_shell.fidl#164)*
+*Defined in [fuchsia.modular/story_shell.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_shell.fidl#158)*
<p>Defines the visual state of the Story shell.</p>
@@ -3085,50 +3231,10 @@
</td>
</tr></table>
-### StoryInfo {#StoryInfo}
-
-
-*Defined in [fuchsia.modular/story_info.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_info.fidl#8)*
-
-<p>Information about a story as provided to the SessionShell.</p>
-
-
-<table>
- <tr><th>Ordinal</th><th>Name</th><th>Type</th><th>Description</th></tr>
- <tr>
- <td>1</td>
- <td><code>id</code></td>
- <td>
- <code>string</code>
- </td>
- <td><p>The ID of the Story, used to reference it in method arguments.</p>
-</td>
- </tr><tr>
- <td>2</td>
- <td><code>last_focus_time</code></td>
- <td>
- <code>int64</code>
- </td>
- <td><p>Wallclock time when the story was last focused. From
-ZX_CLOCK_UTC, thus nanoseconds since UNIX epoch (1970-01-01 00:00 UTC).</p>
-<p>A value of zero means the story has never been focused.</p>
-</td>
- </tr><tr>
- <td>3</td>
- <td><code>annotations</code></td>
- <td>
- <code>vector<<a class='link' href='#Annotation'>Annotation</a>>[100]</code>
- </td>
- <td><p>Collection of user-defined key-value attributes that describe
-this story.</p>
-<p>The <code>Annotation.value</code> field of each <code>Annotation</code> is always set.</p>
-</td>
- </tr></table>
-
### StoryInfo2 {#StoryInfo2}
-*Defined in [fuchsia.modular/story_info.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_info.fidl#27)*
+*Defined in [fuchsia.modular/story_info.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_info.fidl#30)*
<p>Information about a story as provided to the SessionShell.
For transition purposes only.</p>
@@ -3166,73 +3272,10 @@
</td>
</tr></table>
-### SurfaceInfo {#SurfaceInfo}
-
-
-*Defined in [fuchsia.modular/story_shell.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_shell.fidl#92)*
-
-<p>Contains metadata for a Surface.</p>
-
-
-<table>
- <tr><th>Ordinal</th><th>Name</th><th>Type</th><th>Description</th></tr>
- <tr>
- <td>1</td>
- <td><code>parent_id</code></td>
- <td>
- <code>string</code>
- </td>
- <td><p>ID of the view that is parent of this Surface.</p>
-</td>
- </tr><tr>
- <td>2</td>
- <td><code>surface_relation</code></td>
- <td>
- <code><a class='link' href='#SurfaceRelation'>SurfaceRelation</a></code>
- </td>
- <td><p>The relationship between the parent Surface and this new Surface. Used
-for layout optimization.</p>
-</td>
- </tr><tr>
- <td>3</td>
- <td><code>module_manifest</code></td>
- <td>
- <code><a class='link' href='#ModuleManifest'>ModuleManifest</a></code>
- </td>
- <td><p>Information about the module populates the view.</p>
-</td>
- </tr><tr>
- <td>4</td>
- <td><code>module_source</code></td>
- <td>
- <code><a class='link' href='#ModuleSource'>ModuleSource</a></code>
- </td>
- <td><p>How the Surface was generated. By an action internal to the story or by
-an external action.</p>
-</td>
- </tr><tr>
- <td>5</td>
- <td><code>annotations</code></td>
- <td>
- <code>vector<<a class='link' href='#Annotation'>Annotation</a>>[100]</code>
- </td>
- <td><p>Collection of user-defined key-value attributes that describe this surface (module).</p>
-<p>The <code>Annotation.value</code> field of each <code>Annotation</code> is always set.</p>
-</td>
- </tr><tr>
- <td>6</td>
- <td><code>view_ref</code></td>
- <td>
- <code><a class='link' href='../fuchsia.ui.views/'>fuchsia.ui.views</a>/<a class='link' href='../fuchsia.ui.views/#ViewRef'>ViewRef</a></code>
- </td>
- <td><p>The view ref associated with the surface, if one is present.</p>
-</td>
- </tr></table>
-
### SurfaceInfo2 {#SurfaceInfo2}
-*Defined in [fuchsia.modular/story_shell.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_shell.fidl#117)*
+*Defined in [fuchsia.modular/story_shell.fidl](https://fuchsia.googlesource.com/fuchsia/+/master/sdk/fidl/fuchsia.modular/story/story_shell.fidl#111)*
<p>Contains metadata for a Surface.</p>
