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

Commit e21bed28 authored by Dirk Dougherty's avatar Dirk Dougherty
Browse files

Merge changes from templates-sdk to templates-sdk-dyn. 

Change-Id: I42e42f8d412eae6fc1160594c235cda81b2baf4f
parent 613b251b

tools/droiddoc/templates-sdk-dyn/assets/css/default.css

+37 −7
Original line number Diff line number Diff line
@@ -359,6 +359,19 @@ video.with-shadow { 
  #nav li span.tree-list-subtitle:after {

    content: '—';

  }

  #nav li span.tree-list-subtitle.package {

    padding-top:15px;

    cursor:default;

  }

  #nav li span.tree-list-subtitle.package:before {

    content: '';

  }

  #nav li span.tree-list-subtitle.package:after {

    content: '';

  }

  #nav li ul.tree-list-children.classes {

    padding-left:10px;

  }

  #nav li ul {

    display:none;

    overflow: hidden;
@@ -1516,11 +1529,12 @@ Header, Login, Nav-X, Search 
.develop a.selected {

    color: #F80;

}



.distribute a.selected {

    color: #9C0;

}







.nav-x li {

    display: inline;

    margin-right: 45px;
@@ -1631,8 +1645,6 @@ Header, Login, Nav-X, Search 
.search-dropdown li a:hover h6, .search-dropdown li a:hover .desc {

  color: #33b5e5

}





/* --------------------------------------------------------------------------

Buttons

*/
@@ -1902,6 +1914,7 @@ EndColorStr='#ececec'); 
.sidebox h5 {

  font-weight:bold;

  margin:0 0 10px;

  line-height: 16px;

}



.sidebox * {
@@ -4155,6 +4168,16 @@ EndColorStr='#ececec'); 
  padding-right:10px;

}





#header-wrap .logo-wear {

  width:220px;

  margin:0;

  margin-bottom:22px;

}

#header-wrap .logo-wear img {

  padding:0 0 0 10px;

}



.search {

  height:25px;

  margin-top: -3px;
@@ -4967,16 +4990,22 @@ a.download-sdk { 
.landing-docs a {

  color:#333 !important;

}



.landing-docs a:hover,

.landing-docs a:hover * {

  color:#7AA1B0 !important

}



.landing-docs .normal-links a {

  color:#258aaf !important;

}



.plusone {

  float:right;

}







.next-docs {

  border-top:1px solid #ccc;

  margin:40px 0 0;
@@ -4990,13 +5019,14 @@ a.download-sdk { 
.next-docs div:last-child {

  margin-right:0;

}



.next-docs h2 {

  font-size:14px;

  line-height:21px;

  color:#555;

  text-transform:uppercase;

  border-bottom:none;

  margin:0;

  margin:0 0 1em;

  padding:5px 0 0;

}

tools/droiddoc/templates-sdk-dyn/assets/images/dac_logo@2x.png

0 → 100644
+2.44 KiB
Loading image diff...

tools/droiddoc/templates-sdk-dyn/components/masthead.cs

+149 −2
Original line number Diff line number Diff line 
<?cs def:custom_masthead() ?>

<?cs if:wear ?>

  <?cs call:wear_masthead() ?>

<?cs else ?>

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

<?cs if:!devsite ?><?cs # leave out the global header for devsite; it is in devsite template ?>

    <!-- Header --><div id="header-wrapper">
@@ -6,7 +9,9 @@ 
        <div class="wrap" id="header-wrap">

          <div class="col-3 logo">

          <a href="<?cs var:toroot ?>index.html">

            <img src="<?cs var:toroot ?>assets/images/dac_logo.png" width="123" height="25" alt="Android Developers" />

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

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

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

          </a>

          <div class="btn-quicknav" id="btn-quicknav">

          	<a href="#" class="arrow-inactive">Quicknav</a>
@@ -314,5 +319,147 @@ onkeyup="return search_changed(event, false, '<?cs var:toroot ?>')" /> 
  </div>

</div>



<?cs /if ?><?cs # end if/else !devsite ?><?cs

<?cs /if ?><?cs # end if/else !devsite ?>

<?cs /if ?><?cs # end if/else wear ?><?cs

/def ?>



<?cs def:wear_masthead() ?>

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



<!-- Header --><div id="header-wrapper">

        <div class="wrap" id="header-wrap">

          <div class="col_3 logo-wear">

            <a href="<?cs var:toroot ?>wear/index.html">

              <img src="<?cs var:toroot ?>wear/images/android-wear.png" height="16" alt="Android Wear" />

            </a>

          </div>

        </div>



        <div class="col-8" style="margin:0"><h1 style="margin:1px 0 0 20px;padding:0;line-height:16px;

  color:#666;font-weight:100;font-size:24px;">Developer Preview</h1></div>



          <!-- New Search -->

          <div class="menu-container">

            <div class="moremenu">

          <div id="more-btn"></div>

	    </div>

  <div class="morehover" id="moremenu">

    <div class="top"></div>

    <div class="mid">

      <div class="header">Links</div>

      <ul>

        <li><a href="https://play.google.com/apps/publish/">Google Play Developer Console</a></li>

        <li><a href="http://android-developers.blogspot.com/">Android Developers Blog</a></li>

        <li><a href="<?cs var:toroot ?>about/index.html">About Android</a></li>

      </ul>

      <div class="header">Android Sites</div>

      <ul>

        <li><a href="http://www.android.com">Android.com</a></li>

        <li class="active"><a>Android Developers</a></li>

        <li><a href="http://source.android.com">Android Open Source Project</a></li>

      </ul>



      <?cs # Include language switcher only in online docs ?>

      <?cs if:android.whichdoc == "online" ?>

        <div class="header">Language</div>

          <div id="language" class="locales">

            <select name="language" onChange="changeLangPref(this.value, true)">

                <option value="en">English</option>

                <option value="es">Español</option>

                <option value="ja">日本語</option>

                <option value="ko">한국어</option>

                <option value="ru">Русский</option>

                <option value="zh-cn">中文 (中国)</option>

                <option value="zh-tw">中文 (台灣)</option>

            </select>

          </div>

        <script type="text/javascript">

          <!--

          loadLangPref();

            //-->

        </script>

      <?cs /if ?>

      <?cs # End of lang switcher ?>





      <br class="clearfix" />

    </div><!-- end mid -->

    <div class="bottom"></div>

  </div><!-- end morehover -->



  <div class="search" id="search-container">

    <div class="search-inner">

      <div id="search-btn"></div>

      <div class="left"></div>

      <form onsubmit="return submit_search()">

        <input id="search_autocomplete" type="text" value="" autocomplete="off" name="q"

onfocus="search_focus_changed(this, true)" onblur="search_focus_changed(this, false)"

onkeydown="return search_changed(event, true, '<?cs var:toroot ?>')"

onkeyup="return search_changed(event, false, '<?cs var:toroot ?>')" />

      </form>

      <div class="right"></div>

        <a class="close hide">close</a>

        <div class="left"></div>

        <div class="right"></div>

    </div>

  </div><!--  end search -->



  <div class="search_filtered_wrapper reference">

    <div class="suggest-card reference no-display">

      <ul class="search_filtered">

      </ul>

    </div>

  </div>



  <div class="search_filtered_wrapper docs">

    <div class="suggest-card dummy no-display">&nbsp;</div>

    <div class="suggest-card develop no-display">

      <ul class="search_filtered">

      </ul>

      <div class="child-card guides no-display">

      </div>

      <div class="child-card training no-display">

      </div>

      <div class="child-card samples no-display">

      </div>

    </div>

    <div class="suggest-card design no-display">

      <ul class="search_filtered">

      </ul>

    </div>

    <div class="suggest-card distribute no-display">

      <ul class="search_filtered">

      </ul>

    </div>

  </div><!-- end search_filtered_wrapper -->



  </div>

  <!-- end menu_container -->





        </div><!-- end header-wrap -->

    </div>

    <!-- /Header -->





  <div id="searchResults" class="wrap" style="display:none;">

          <h2 id="searchTitle">Results</h2>

          <div id="leftSearchControl" class="search-control">Loading...</div>

  </div>



</div> <!--end headerwrap -->



<div id="sticky-header">

  <div>

    <a class="logo" href="#top"></a>

    <a class="top" href="#top"></a>

    <ul class="breadcrumb">

      <?cs # More <li> elements added here with javascript ?>

      <?cs if:!section.landing ?><li class="current"><?cs var:page.title ?></li><?cs

      /if ?>

    </ul>

  </div>

</div>



  <?cs 

/def ?>

tools/droiddoc/templates-sdk-dyn/customizations.cs

+22 −0
Original line number Diff line number Diff line
@@ -270,6 +270,26 @@ def:about_nav() ?> 
    </script>

<?cs /def ?>





<?cs

def:wear_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">



<?cs

        include:"../../../../frameworks/base/docs/html/wear/wear_toc.cs" ?>





      </div>

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

    <script>

      $(document).ready(function() {

        scrollIntoView("devdoc-nav");

        });

    </script>

<?cs /def ?>



<?cs # The default side navigation for the reference docs ?><?cs 

def:default_left_nav() ?>

<?cs if:reference.gcm || reference.gms ?>
@@ -416,6 +436,8 @@ def:custom_left_nav() ?><?cs 
    call:about_nav() ?><?cs

  elif:distribute ?><?cs

    call:distribute_nav() ?><?cs

  elif:wear ?><?cs

    call:wear_nav() ?><?cs

  else ?><?cs

    call:default_left_nav() ?> <?cs

  /if ?><?cs

tools/droiddoc/templates-sdk-dyn/docpage.cs

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ document.write('<iframe src="https://2507573.fls.doubleclick.net/activityi;src=2 




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

  <script src="https://androiddevdocs-exp.appspot.com/ytblogger_lists_unified.js" type="text/javascript"></script>

  <script src="https://developer.android.com/ytblogger_lists_unified.js" type="text/javascript"></script>

  <script src="<?cs var:toroot ?>jd_lists_unified.js" type="text/javascript"></script>

  <script src="<?cs var:toroot ?>jd_extras.js" type="text/javascript"></script>

  <script src="<?cs var:toroot ?>jd_collections.js" type="text/javascript"></script>