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

Commit e47d8b99 authored by Clay Murphy's avatar Clay Murphy Committed by Gerrit Code Review
Browse files

Merge "Docs: Add Security tab to top"

parents a0975edc 2a0522b2

tools/droiddoc/templates-sac/assets/css/default.css

+1 −1
Original line number Diff line number Diff line
@@ -1511,7 +1511,7 @@ Header, Login, Nav-X, Search 
.devices a.selected {

    color: #F80;

}

.accessories a.selected {

.security a.selected {

    color: #9C0;

}

.compatibility a.selected {

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

+4 −4
Original line number Diff line number Diff line
@@ -1871,9 +1871,9 @@ function loadSearchResults() { 
  devicesSearcher.setUserDefinedLabel("Devices");

  devicesSearcher.setSiteRestriction("http://source.android.com/devices/");



  accessoriesSearcher = new google.search.WebSearch();

  accessoriesSearcher.setUserDefinedLabel("Accessories");

  accessoriesSearcher.setSiteRestriction("http://source.android.com/accessories/");

  securitySearcher = new google.search.WebSearch();

  securitySearcher.setUserDefinedLabel("Security");

  securitySearcher.setSiteRestriction("http://source.android.com/security/");



  compatibilitySearcher = new google.search.WebSearch();

  compatibilitySearcher.setUserDefinedLabel("Compatibility");
@@ -1883,7 +1883,7 @@ function loadSearchResults() { 
  searchControl.addSearcher(sacSiteSearcher, searchOptions);

  searchControl.addSearcher(sourceSearcher, searchOptions);

  searchControl.addSearcher(devicesSearcher, searchOptions);

  searchControl.addSearcher(accessoriesSearcher, searchOptions);

  searchControl.addSearcher(securitySearcher, searchOptions);

  searchControl.addSearcher(compatibilitySearcher, searchOptions);

tools/droiddoc/templates-sac/components/masthead.cs

+4 −4
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ onkeyup="return search_changed(event, false, '<?cs var:toroot ?>')" /> 
          <a href="<?cs var:toroot ?>index.html">

            <img src="<?cs var:toroot ?>assets/images/sac_logo.png"

                srcset="<?cs var:toroot ?>assets/images/sac_logo@2x.png 2x"

                width="123" height="25" alt="Android Developers" />

                width="123" height="25" alt="Android Open Source Project" />

          </a>

          </div>

            <ul class="nav-x col-9">
@@ -266,9 +266,9 @@ onkeyup="return search_changed(event, false, '<?cs var:toroot ?>')" /> 
                <li class="devices"><a href="<?cs var:toroot ?>devices/index.html" <?cs

                  if:devices ?>class="selected"<?cs /if ?>

                  >Devices</a></li>

                <li class="accessories"><a href="<?cs var:toroot ?>accessories/index.html" <?cs

                  if:accessories ?>class="selected"<?cs /if ?>

                  >Accessories</a></li>

                <li class="security"><a href="<?cs var:toroot ?>security/index.html" <?cs

                  if:security ?>class="selected"<?cs /if ?>

                  >Security</a></li>

                <li class="compatibility last"><a href="<?cs var:toroot ?>compatibility/index.html" <?cs

                  if:compatibility ?>class="selected"<?cs /if ?>

                  >Compatibility</a></li>

tools/droiddoc/templates-sac/customizations.cs

+4 −4
Original line number Diff line number Diff line
@@ -382,8 +382,8 @@ def:sac_left_nav() ?> 
    <?cs call:compatibility_nav() ?>

  <?cs elif:source ?>

    <?cs call:source_nav() ?>

  <?cs elif:accessories ?>

    <?cs call:accessories_nav() ?>

  <?cs elif:security ?>

    <?cs call:security_nav() ?>

  <?cs elif:reference ?>

    <?cs call:default_left_nav() ?>

  <?cs /if ?>
@@ -450,14 +450,14 @@ def:source_nav() ?> 
<?cs /def ?>



<?cs

def:accessories_nav() ?>

def:security_nav() ?>

  <div class="wrap clearfix" id="body-content">

    <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">

      <div id="devdoc-nav" class="scroll-pane">

<a class="totop" href="#top" data-g-event="left-nav-top">to top</a>



<?cs 

        include:"../../../../docs/source.android.com/src/accessories/accessories_toc.cs" ?>

        include:"../../../../docs/source.android.com/src/security/security_toc.cs" ?>



      </div>

    </div> <!-- end side-nav -->