tree 0a3284c668dd49aeaee8a575e6984bee9d94b56c
parent 285ea2188d8764333054292ed072608bd99ef7b8
parent 6edfbfabad1ddbda00e0fcc713672f6e63acdf44
author Trevor Johns <trevorjohns@google.com> 1460412980 +0000
committer android-build-merger <android-build-merger@google.com> 1460412980 +0000

Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev
am: 6edfbfa

* commit '6edfbfabad1ddbda00e0fcc713672f6e63acdf44': (44 commits)
  Tabs js error fix, DevSite css issues fix, Search filtering
  new styles and tab-highlighting to support custom Android Studio site design
  tweak the NDK download analytics event tag
  Update modal download dialogs for sdk/ndk download. Revise the redirect behavior once download completes. Add more appropriate title and download message when installing SDK tools only. Force refresh when the Studio download dialog is dismissed, to avoid leaving the dialog in stale state. Add styles for the Studio download page.
  increment version for fetched js and cs files to avoid proxy caching.
  Migrating web search api to custom search api on templates-sdk
  new search results layout. no more custom suggestions; just API matches and organic results.
  remove dev guide search suggestions, move organic search results up. tweak the search suggest for reference pages
  Adding book metadata to doc head, fix tabs for content build, fix for reference page double footer.
  increment docs.js version to force browser refresh. needed to load recent fixes to the zippies.
  update zippy icons to use material arrow (up/down instead of right/down). fixes bug 27695580, which was caused because I previously submitted an update to the code doclava templates to do this but did not update the current site templates in kind.
  Docs: Change MD5 to SHA1 in NDK download table column heading
  change name of offline doc tab to "API reference" and put the version number in the secondary nav bar (it was there anyway).
  Fix broken suggestions for preview.
  Revert "Search for suggestion matches across PREVIEW_RESOURCES."
  Docs: Updates NDK download table for NDKr11
  make image resource URLs relative so they work in offline docs
  docs: Update DAC template to force refresh of resources
  Add new templates directory for "reference only" builds. The only difference is that this changes the masthead.cs file to show a different header.
  Add styles to compress the summary table presentation.
  ...

Change-Id: I47a5c85da5c4f8edffa9ca3e6ba4bb573cc2666c