Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26990b0f authored by Neil Fuller's avatar Neil Fuller Committed by Gerrit Code Review
Browse files

Merge "Doclava template changes associated with default methods"

parents 3e2f5d83 8f7d4b74

tools/droiddoc/templates-ds/class.cs

+7 −5
Original line number Diff line number Diff line
@@ -184,8 +184,9 @@ Summary: 
    <tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:method.since ?>" >

        <td class="jd-typecol"><nobr>

            <?cs var:method.abstract ?>

            <?cs var:method.final ?>

            <?cs var:method.default ?>

            <?cs var:method.static ?>

            <?cs var:method.final ?>

            <?cs call:type_link(method.generic) ?>

            <?cs call:type_link(method.returnType) ?></nobr>

        </td>
@@ -531,9 +532,10 @@ From <?cs var:cl.kind ?> 
    <h4 class="jd-details-title">

      <span class="normal">

        <?cs var:method.scope ?>

        <?cs var:method.abstract ?>

        <?cs var:method.default ?>

        <?cs var:method.static ?>

        <?cs var:method.final ?>

        <?cs var:method.abstract ?> 

        <?cs call:type_link(method.returnType) ?>

      </span>

      <span class="sympad"><?cs var:method.name ?></span>

tools/droiddoc/templates-ndk/class.cs

+7 −5
Original line number Diff line number Diff line
@@ -188,8 +188,9 @@ Summary: 
    <tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:method.since ?>" >

        <td class="jd-typecol"><nobr>

            <?cs var:method.abstract ?>

            <?cs var:method.final ?>

            <?cs var:method.default ?>

            <?cs var:method.static ?>

            <?cs var:method.final ?>

            <?cs call:type_link(method.generic) ?>

            <?cs call:type_link(method.returnType) ?></nobr>

        </td>
@@ -554,9 +555,10 @@ From <?cs var:cl.kind ?> 
    <h4 class="jd-details-title">

      <span class="normal">

        <?cs var:method.scope ?>

        <?cs var:method.abstract ?>

        <?cs var:method.default ?>

        <?cs var:method.static ?>

        <?cs var:method.final ?>

        <?cs var:method.abstract ?> 

        <?cs call:type_link(method.returnType) ?>

      </span>

      <span class="sympad"><?cs var:method.name ?></span>

tools/droiddoc/templates-sac/class.cs

+7 −5
Original line number Diff line number Diff line
@@ -185,8 +185,9 @@ Summary: 
    <tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:method.since ?>" >

        <td class="jd-typecol"><nobr>

            <?cs var:method.abstract ?>

            <?cs var:method.final ?>

            <?cs var:method.default ?>

            <?cs var:method.static ?>

            <?cs var:method.final ?>

            <?cs call:type_link(method.generic) ?>

            <?cs call:type_link(method.returnType) ?></nobr>

        </td>
@@ -535,9 +536,10 @@ From <?cs var:cl.kind ?> 
    <h4 class="jd-details-title">

      <span class="normal">

        <?cs var:method.scope ?>

        <?cs var:method.abstract ?>

        <?cs var:method.default ?>

        <?cs var:method.static ?>

        <?cs var:method.final ?>

        <?cs var:method.abstract ?> 

        <?cs call:type_link(method.returnType) ?>

      </span>

      <span class="sympad"><?cs var:method.name ?></span>

tools/droiddoc/templates-sdk-dev/class.cs

+7 −5
Original line number Diff line number Diff line
@@ -190,8 +190,9 @@ Summary: 
    <tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:method.since ?>" >

        <td class="jd-typecol"><nobr>

            <?cs var:method.abstract ?>

            <?cs var:method.final ?>

            <?cs var:method.default ?>

            <?cs var:method.static ?>

            <?cs var:method.final ?>

            <?cs call:type_link(method.generic) ?>

            <?cs call:type_link(method.returnType) ?></nobr>

        </td>
@@ -556,9 +557,10 @@ From <?cs var:cl.kind ?> 
    <h4 class="jd-details-title">

      <span class="normal">

        <?cs var:method.scope ?>

        <?cs var:method.abstract ?>

        <?cs var:method.default ?>

        <?cs var:method.static ?>

        <?cs var:method.final ?>

        <?cs var:method.abstract ?> 

        <?cs call:type_link(method.returnType) ?>

      </span>

      <span class="sympad"><?cs var:method.name ?></span>

tools/droiddoc/templates-sdk/class.cs

+7 −5
Original line number Diff line number Diff line
@@ -188,8 +188,9 @@ Summary: 
    <tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:method.since ?>" >

        <td class="jd-typecol"><nobr>

            <?cs var:method.abstract ?>

            <?cs var:method.final ?>

            <?cs var:method.default ?>

            <?cs var:method.static ?>

            <?cs var:method.final ?>

            <?cs call:type_link(method.generic) ?>

            <?cs call:type_link(method.returnType) ?></nobr>

        </td>
@@ -554,9 +555,10 @@ From <?cs var:cl.kind ?> 
    <h4 class="jd-details-title">

      <span class="normal">

        <?cs var:method.scope ?>

        <?cs var:method.abstract ?>

        <?cs var:method.default ?>

        <?cs var:method.static ?>

        <?cs var:method.final ?>

        <?cs var:method.abstract ?> 

        <?cs call:type_link(method.returnType) ?>

      </span>

      <span class="sympad"><?cs var:method.name ?></span>