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

Commit 691369bd authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 287d1e42: am 6a040270: am 34a4b823: Merge "docs: revise message when api... 

am 287d1e42: am 6a040270: am 34a4b823: Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev

* commit '287d1e42':
  docs: revise message when api level for docs is too low; make the message appear on package pages as well
parents fdf573e4 287d1e42

tools/droiddoc/templates-sdk/assets/js/docs.js

+12 −5
Original line number Original line Diff line number Diff line
@@ -1938,11 +1938,18 @@ function changeApiLevel() { 




  if (selectedLevel < minLevel) {

  if (selectedLevel < minLevel) {

    var thing = ($("#jd-header").html().indexOf("package") != -1) ? "package" : "class";

    var thing = ($("#jd-header").html().indexOf("package") != -1) ? "package" : "class";

    $("#naMessage").show().html("<div><p><strong>This " + thing + " is not available with API level " + selectedLevel + ".</strong></p>"

    $("#naMessage").show().html("<div><p><strong>This " + thing

                              + "<p>To use this " + thing + ", you must develop your app using a build target "

              + " requires API level " + minLevel + " or higher.</strong></p>"

                              + "that supports API level " + $("#doc-api-level").attr("class") + " or higher. To read these "

              + "<p>This document is hidden because your selected API level for the documentation is "

                              + "APIs, change the value of the API level filter above.</p>"

              + selectedLevel + ". You can change the documentation API level with the selector "

                              + "<p><a href='" +toRoot+ "guide/appendix/api-levels.html'>What is the API level?</a></p></div>");

              + "above the left navigation.</p>"

              + "<p>For more information about specifying the API level your app requires, "

              + "read <a href='" + toRoot + "training/basics/supporting-devices/platforms.html'"

              + ">Supporting Different Platform Versions</a>.</p>"

              + "<input type='button' value='OK, make this page visible' "

              + "title='Change the API level to " + minLevel + "' "

              + "onclick='$(\"#apiLevelSelector\").val(\"" + minLevel + "\");changeApiLevel();' />"

              + "</div>");

  } else {

  } else {

    $("#naMessage").hide();

    $("#naMessage").hide();

  }

  }

tools/droiddoc/templates-sdk/package.cs

+1 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ 
  elif:design ?>design<?cs

  elif:design ?>design<?cs

  elif:distribute ?>distribute<?cs

  elif:distribute ?>distribute<?cs

  /if ?>">

  /if ?>">

  <div id="doc-api-level" class="<?cs var:class.since ?>" style="display:none"></div>

  <div id="doc-api-level" class="<?cs var:package.since ?>" style="display:none"></div>

  <a name="top"></a>

  <a name="top"></a>

<?cs include:"header.cs" ?>

<?cs include:"header.cs" ?>