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

Commit d8cfce0d authored by Dirk Dougherty's avatar Dirk Dougherty Committed by The Android Open Source Project
Browse files

AI 150536: Change the formatting of sdk redirect pages so that they are not language-specific. 

  BUG=1790234

Automated import of CL 150536
parent 3ba448c7

tools/droiddoc/src/DocFile.java

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ public class DocFile 
        } else {

            if (outfile.indexOf("sdk/") != -1) {

                hdf.setValue("sdk", "true");

                if (outfile.indexOf("index.html") != -1) {

                if ((outfile.indexOf("index.html") != -1) || (outfile.indexOf("features.html") != -1)) {

                    ClearPage.write(hdf, "sdkpage.cs", outfile);

                } else {

                    ClearPage.write(hdf, "docpage.cs", outfile);

tools/droiddoc/templates-sdk/sdkpage.cs

+8 −4
Original line number Diff line number Diff line
@@ -4,7 +4,9 @@ 
<?cs if:sdk.redirect ?>

  <head>

    <title>Redirecting...</title>

    <meta http-equiv="refresh" content="0;url=<?cs var:toroot ?>sdk/<?cs var:sdk.current ?>/index.html">

    <meta http-equiv="refresh" content="0;url=<?cs var:toroot ?>sdk/<?cs 

      if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?>"<?cs 

      else ?><?cs var:sdk.current ?>/index.html<?cs /if ?>"

    <link href="<?cs var:toroot ?>assets/android-developer-docs.css" rel="stylesheet" type="text/css" />

  </head>

<?cs else ?>
@@ -17,12 +19,14 @@ 
<?cs call:sdk_nav() ?>



<?cs if:sdk.redirect ?>



<div class="g-unit">

  <div id="jd-content">

    <p>Redirecting to 

    <a href="/sdk/<?cs var:sdk.current ?>/index.html">

    /sdk/<?cs var:sdk.current ?>/index.html

    </a></p>

    <a href="<?cs var:toroot ?>sdk/<?cs 

      if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?>">/sdk/<?cs var:sdk.redirect.path ?><?cs 

      else ?><?cs var:sdk.current ?>/index.html">/sdk/<?cs var:sdk.current ?>/index.html<?cs /if ?>

    </a> ...</p>

<?cs else ?>

<div class="g-unit" id="doc-content" >

  <div id="jd-header" class="guide-header" >