Merge all of templates-sdk-dev into templates-sdk.
I actually just deleted templates-sdk/ then made a copy of templates-sdk-dev/
and then renamed it to templates-sdk/. So this is a clean copy.
Once this goes through cleanly, I'll delete templates-sdk-dev/ and update
all doc targets to use templates-sdk/.
Change-Id: I276695969e02fcf718370564e84b077a9d43725e
diff --git a/tools/droiddoc/templates-sdk/header.cs b/tools/droiddoc/templates-sdk/header.cs
index e8301be..a927393 100644
--- a/tools/droiddoc/templates-sdk/header.cs
+++ b/tools/droiddoc/templates-sdk/header.cs
@@ -1,3 +1,11 @@
-<?cs call:custom_masthead() ?>
-<?cs call:custom_left_nav() ?>
+<?cs if:!devsite ?><?cs # leave out the global header for devsite; it is in devsite template ?>
+ <?cs call:custom_masthead() ?>
+ <?cs if:(fullpage) ?>
+ <?cs call:fullpage() ?>
+ <?cs else ?>
+ <?cs call:body_content_wrap_start() ?>
+ <?cs /if ?>
+
+ <?cs call:search_results() ?>
+<?cs /if ?><?cs # end if/else !devsite ?>
\ No newline at end of file