Skip to content

GitLab

Commit 41977d7c authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

auto import from //branches/cupcake/...@132276

parent dca10d53
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 522 additions and 478 deletions
cleanspec.mk
View file @ 41977d7c
......@@ -66,6 +66,8 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Browser_intermed
$(call add-clean-step, rm -f vendor/google/apps/Talk/res/drawable/%*)
$(call add-clean-step, rm -rf $(OUT_DIR)/product/*/obj/SHARED_LIBRARIES/libandroid_runtime_intermediates/android_os_NetStat.o)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/libjni_andpyime_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/share)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
......
core/Makefile
View file @ 41977d7c
......@@ -618,7 +618,14 @@ recovery_kernel := $(INSTALLED_KERNEL_TARGET) # same as a non-recovery system
recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img
recovery_build_prop := $(INSTALLED_BUILD_PROP_TARGET)
recovery_binary := $(call intermediates-dir-for,EXECUTABLES,recovery)/recovery
recovery_resources := $(call include-path-for, recovery)/res
recovery_resources_common := $(call include-path-for, recovery)/res
recovery_resources_private := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery/res))
recovery_resource_deps := $(shell find $(recovery_resources_common) \
$(recovery_resources_private) -type f)
ifeq ($(recovery_resources_private),)
$(info No private recovery resources for TARGET_DEVICE $(TARGET_DEVICE))
endif
INTERNAL_RECOVERYIMAGE_ARGS := \
$(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET)) \
......@@ -636,7 +643,7 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) \
$(recovery_binary) \
$(recovery_initrc) $(recovery_kernel) \
$(INSTALLED_2NDBOOTLOADER_TARGET) \
$(recovery_build_prop)
$(recovery_build_prop) $(recovery_resource_deps)
@echo ----- Making recovery image ------
rm -rf $(TARGET_RECOVERY_OUT)
mkdir -p $(TARGET_RECOVERY_OUT)
......@@ -648,7 +655,9 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) \
echo Modifying ramdisk contents...
cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/
cp -f $(recovery_binary) $(TARGET_RECOVERY_ROOT_OUT)/sbin/
cp -rf $(recovery_resources) $(TARGET_RECOVERY_ROOT_OUT)/
cp -rf $(recovery_resources_common) $(TARGET_RECOVERY_ROOT_OUT)/
$(foreach item,$(recovery_resources_private), \
cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/)
cat $(INSTALLED_DEFAULT_PROP_TARGET) $(recovery_build_prop) \
> $(TARGET_RECOVERY_ROOT_OUT)/default.prop
$(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) | gzip > $(recovery_ramdisk)
......
core/main.mk
View file @ 41977d7c
......@@ -313,11 +313,18 @@ ifeq ($(BUILD_TINY_ANDROID), true)
INTERNAL_DEFAULT_DOCS_TARGETS :=
subdirs := \
bionic \
system/core \
external/zlib \
build/tools \
tools/kcm \
external/yaffs2
build/libs \
build/target \
build/tools/acp \
build/tools/apriori \
build/tools/kcm \
build/tools/soslim \
external/elfcopy \
external/elfutils \
external/yaffs2 \
external/zlib
else # !BUILD_TINY_ANDROID
#
......@@ -489,7 +496,7 @@ overridden_packages := $(call get-package-overrides,$(modules_to_build))
ifdef overridden_packages
# old_modules_to_build := $(modules_to_build)
modules_to_build := \
$(filter-out $(foreach p,$(overridden_packages),%/$(p) %/$(p).apk), \
$(filter-out $(foreach p,$(overridden_packages),$(p) %/$(p).apk), \
$(modules_to_build))
endif
#$(error filtered out $(filter-out $(modules_to_build),$(old_modules_to_build)))
......
core/tasks/apicheck.mk
View file @ 41977d7c
......@@ -17,6 +17,8 @@
# api compatibility or added apis illegally.
#
ifneq ($(BUILD_TINY_ANDROID), true)
.PHONY: checkapi
# eval this to define a rule that runs apicheck.
......@@ -71,3 +73,4 @@ update-api: $(INTERNAL_PLATFORM_API_FILE) | $(ACP)
@echo Copying current.xml
$(hide) $(ACP) $(INTERNAL_PLATFORM_API_FILE) $(SRC_API_DIR)/current.xml
endif
tools/droiddoc/templates-sdk/customization.cs
View file @ 41977d7c
<?cs # This default template file is meant to be replaced. ?>
<?cs # Use the -tempatedir arg to javadoc to set your own directory with a replacement for this file in it. ?>
<?cs def:custom_masthead() ?>
<div id="header">
<div id="headerLeft">
<a href="<?cs var:toroot ?>index.html" tabindex="-1"><img
src="<?cs var:toroot ?>assets/images/bg_logo.png" alt="Android Developers" /></a>
<?cs
def:custom_masthead() ?>
<div id="header">
<div id="headerLeft">
<a href="<?cs var:toroot ?>index.html" tabindex="-1"><img
src="<?cs var:toroot ?>assets/images/bg_logo.png" alt="Android Developers" /></a>
<ul class="<?cs
if:reference ?>reference<?cs
elif:guide ?>guide<?cs
elif:sdk ?>sdk<?cs
elif:home ?>home<?cs
elif:community ?>community<?cs
elif:publish ?>publish<?cs
elif:about ?>about<?cs /if ?>">
<li id="home-link"><a href="<?cs var:toroot ?><?cs
if:android.whichdoc != "online" ?>offline.html<?cs
else ?>index.html<?cs /if ?>">
<span>Home</span></a></li>
<li id="sdk-link"><a href="<?cs var:toroot ?>sdk/1.1_r1/index.html"><span>SDK</span></a></li>
<li id="guide-link"><a href="<?cs var:toroot ?>guide/index.html"
onClick="return loadLast('guide')"><span>Dev Guide</span></a></li>
<li id="reference-link"><a href="<?cs var:toroot ?>reference/packages.html"
onClick="return loadLast('reference')"><span>Reference</span></a></li>
<li><a href="http://android-developers.blogspot.com"><span>Blog</span></a></li>
<li id="community-link"><a href="<?cs var:toroot ?>community/index.html"><span>Community</span></a></li>
</ul>
</div>
<div id="headerRight">
<div id="headerLinks">
<!-- <img src="<?cs var:toroot ?>assets/images/icon_world.jpg" alt="" /> -->
<span class="text">
<!-- &nbsp;<a href="#">English</a> | -->
<a href="http://www.android.com">Android.com</a>
</span>
</div><?cs
call:default_search_box() ?>
</div><!-- headerRight -->
</div><!-- header --><?cs
/def ?><?cs # custom_masthead ?>
<ul class="<?cs
if:reference ?>reference<?cs
elif:guide ?>guide<?cs
elif:sdk ?>sdk<?cs
elif:home ?>home<?cs
elif:community ?>community<?cs
elif:publish ?>publish<?cs
elif:about ?>about<?cs /if ?>">
<li id="home-link"><a href="<?cs var:toroot ?><?cs
if:android.whichdoc != "online" ?>offline.html<?cs
else ?>index.html<?cs /if ?>">
<span>Home</span></a></li>
<li id="sdk-link"><a href="<?cs var:toroot ?>sdk/1.1_r1/index.html"><span>SDK</span></a></li>
<li id="guide-link"><a href="<?cs var:toroot ?>guide/index.html"
onClick="return loadLast('guide')"><span>Dev Guide</span></a></li>
<li id="reference-link"><a href="<?cs var:toroot ?>reference/packages.html"
onClick="return loadLast('reference')"><span>Reference</span></a></li>
<li><a href="http://android-developers.blogspot.com"><span>Blog</span></a></li>
<li id="community-link"><a href="<?cs var:toroot ?>community/index.html"><span>Community</span></a></li>
</ul>
</div>
<div id="headerRight">
<div id="headerLinks">
<!-- <img src="<?cs var:toroot ?>assets/images/icon_world.jpg" alt="" /> -->
<span class="text">
<!-- &nbsp;<a href="#">English</a> | -->
<a href="http://www.android.com">Android.com</a>
</span>
</div>
<?cs call:default_search_box() ?>
</div><!-- headerRight -->
</div><!-- header -->
<?cs /def ?><?cs # custom_masthead ?>
<?cs def:sdk_nav() ?>
<div class="g-section g-tpl-240" id="body-content">
<div class="g-unit g-first not-resizable" id="side-nav">
<div id="devdoc-nav">
<?cs include:"../../../../frameworks/base/docs/html/sdk/sdk_toc.cs" ?>
</div>
</div> <!-- end side-nav -->
<?cs
def:sdk_nav() ?>
<div class="g-section g-tpl-240" id="body-content">
<div class="g-unit g-first not-resizable" id="side-nav">
<div id="devdoc-nav"><?cs
include:"../../../../frameworks/base/docs/html/sdk/sdk_toc.cs" ?>
</div>
</div> <!-- end side-nav -->
<?cs /def ?>
<?cs def:guide_nav() ?>
<div class="g-section g-tpl-240" id="body-content">
<div class="g-unit g-first side-nav-resizable" id="side-nav">
<div id="devdoc-nav">
<?cs include:"../../../../frameworks/base/docs/html/guide/guide_toc.cs" ?>
</div>
</div> <!-- end side-nav -->
<script>
addLoadEvent(function() {
scrollIntoView("devdoc-nav");
});
</script>
<?cs
def:guide_nav() ?>
<div class="g-section g-tpl-240" id="body-content">
<div class="g-unit g-first side-nav-resizable" id="side-nav">
<div id="devdoc-nav"><?cs
include:"../../../../frameworks/base/docs/html/guide/guide_toc.cs" ?>
</div>
</div> <!-- end side-nav -->
<script>
addLoadEvent(function() {
scrollIntoView("devdoc-nav");
});
</script>
<?cs /def ?>
<?cs def:custom_left_nav() ?>
<?cs if:guide ?>
<?cs call:guide_nav() ?>
<?cs elif:sdk ?>
<?cs call:sdk_nav() ?>
<?cs else ?>
<?cs call:default_left_nav() ?>
<?cs /if ?>
<?cs
def:publish_nav() ?>
<div class="g-section g-tpl-180" id="body-content">
<div class="g-unit g-first" id="side-nav">
<div id="devdoc-nav"><?cs
include:"../../../../frameworks/base/docs/html/publish/publish_toc.cs" ?>
</div>
</div> <!-- end side-nav -->
<?cs /def ?>
<?cs # appears on the left side of the blue bar at the bottom of every page ?>
<?cs def:custom_cc_copyright() ?>Except as noted, this content is
licensed under <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>. For details and
restrictions, see the <a href="<?cs var:toroot ?>license.html">Content
License</a>.<?cs /def ?>
<?cs
def:custom_left_nav() ?><?cs
if:guide ?><?cs
call:guide_nav() ?><?cs
elif:publish ?><?cs
call:publish_nav() ?><?cs
elif:sdk ?><?cs
call:sdk_nav() ?><?cs
else ?><?cs
call:default_left_nav() ?><?cs
/if ?><?cs
/def ?>
<?cs def:custom_copyright() ?>Except as noted, this content is
licensed under <a
href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a>.
For details and restrictions, see the <a href="<?cs var:toroot ?>license.html">
Content License</a>.<?cs /def ?>
<?cs # appears at the bottom of every page ?><?cs
def:custom_cc_copyright() ?>
Except as noted, this content is
licensed under <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>. For details and
restrictions, see the <a href="<?cs var:toroot ?>license.html">Content
License</a>.<?cs
/def ?>
<?cs def:custom_footerlinks() ?>
<p>
<a href="http://www.android.com/terms.html">Site Terms of Service</a> -
<a href="http://www.android.com/privacy.html">Privacy Policy</a> -
<a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
<?cs /def ?>
<?cs
def:custom_copyright() ?>
Except as noted, this content is licensed under <a
href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a>.
For details and restrictions, see the <a href="<?cs var:toroot ?>license.html">
Content License</a>.<?cs
/def ?>
<?cs
def:custom_footerlinks() ?>
<p>
<a href="http://www.android.com/terms.html">Site Terms of Service</a> -
<a href="http://www.android.com/privacy.html">Privacy Policy</a> -
<a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p><?cs
/def ?>
<?cs # appears on the right side of the blue bar at the bottom of every page ?>
<?cs def:custom_buildinfo() ?>Android 1.1 r1 - <?cs var:page.now ?><?cs /def ?>
<?cs # appears on the right side of the blue bar at the bottom of every page ?><?cs
def:custom_buildinfo() ?>
Android 1.1 r1 - <?cs var:page.now ?><?cs
/def ?>
tools/droiddoc/templates/assets/android-developer-docs.css
View file @ 41977d7c
......@@ -30,6 +30,7 @@
#side-nav {
padding:0 6px 0 0;
background-color: #fff;
font-size:12px;
}
......@@ -660,7 +661,7 @@ pre.classic {
float: right;
width:310px;
background-color:#fff;
margin:-48px 0 0 0;
margin:-48px 0 2px 0;
padding:0 0 20px 35px;
}
......
tools/droiddoc/templates/assets/carousel.js
View file @ 41977d7c
......@@ -9,7 +9,7 @@
var oldVid = "multi"; // set the default video
var nowPlayingString = "Now playing:";
var assetsRoot = "/assets/";
var assetsRoot = "assets/";
/* -- app thumbnail switcher -- */
......@@ -60,7 +60,7 @@ function droid(appName){
descDiv.className = "desc-left";
}
imgDiv.innerHTML = "<img src='" + assetsRoot + "images/home/" + droid.img + "'>";
imgDiv.innerHTML = "<img src='" + toRoot + assetsRoot + "images/home/" + droid.img + "'>";
descDiv.innerHTML = (droid.title != "") ? "<h3>" + droid.title + "</h3>" + droid.desc : droid.desc;
if(oldDroid)
......@@ -87,7 +87,7 @@ function buildCarousel() {
a.className = x;
a.setAttribute("href", "#");
a.onclick = function() { showPreview(this.className); return false; }
img.setAttribute("src", assetsRoot + "images/home/" + droid.icon);
img.setAttribute("src", toRoot + assetsRoot + "images/home/" + droid.icon);
img.setAttribute("alt", "");
span.appendChild(text);
......
tools/droiddoc/templates/class.cs
View file @ 41977d7c
......@@ -157,7 +157,7 @@ Summary:
</table>
<?cs # this next line must be exactly like this to be parsed by eclipse ?>
<!-- ======== NESTED CLASS SUMMARY ======== -->
<?cs if:subcount(class.subclasses.direct) ?>
<table class="jd-sumtable jd-sumtable-subclasses"><tr><td colspan="12" style="border:none;margin:0;padding:0;">
<?cs call:expando_trigger("subclasses-direct", "closed") ?>Known Direct Subclasses
......@@ -295,6 +295,8 @@ Summary:
<?cs # if there are inherited attrs, write the table ?>
<?cs if:inhattrs ?>
<?cs # this next line must be exactly like this to be parsed by eclipse ?>
<!-- =========== FIELD SUMMARY =========== -->
<table id="inhattrs" class="jd-sumtable"><tr><th>
<a href="#" class="toggle-all" onclick="return toggleAllInherited(this, null)">[Expand]</a>
<div style="clear:left;">Inherited XML Attributes</div></th></tr>
......@@ -335,7 +337,7 @@ Summary:
<?cs if:subcount(class.constants) ?>
<?cs # this next line must be exactly like this to be parsed by eclipse ?>
<!-- =========== FIELD SUMMARY =========== -->
<!-- =========== ENUM CONSTANT SUMMARY =========== -->
<table id="constants" class="jd-sumtable"><tr><th colspan="12">Constants</th></tr>
<?cs call:write_constant_summary(class.constants) ?>
</table>
......@@ -343,6 +345,8 @@ Summary:
<?cs # if there are inherited constants, write the table ?>
<?cs if:inhconstants ?>
<?cs # this next line must be exactly like this to be parsed by eclipse ?>
<!-- =========== ENUM CONSTANT SUMMARY =========== -->
<table id="inhconstants" class="jd-sumtable"><tr><th>
<a href="#" class="toggle-all" onclick="return toggleAllInherited(this, null)">[Expand]</a>
<div style="clear:left;">Inherited Constants</div></th></tr>
......@@ -376,6 +380,8 @@ Summary:
<?cs # if there are inherited fields, write the table ?>
<?cs if:inhfields ?>
<?cs # this next line must be exactly like this to be parsed by eclipse ?>
<!-- =========== FIELD SUMMARY =========== -->
<table id="inhfields" class="jd-sumtable"><tr><th>
<a href="#" class="toggle-all" onclick="return toggleAllInherited(this, null)">[Expand]</a>
<div style="clear:left;">Inherited Fields</div></th></tr>
......@@ -433,6 +439,8 @@ Summary:
<?cs # if there are inherited methods, write the table ?>
<?cs if:inhmethods ?>
<?cs # this next line must be exactly like this to be parsed by eclipse ?>
<!-- ========== METHOD SUMMARY =========== -->
<table id="inhmethods" class="jd-sumtable"><tr><th>
<a href="#" class="toggle-all" onclick="return toggleAllInherited(this, null)">[Expand]</a>
<div style="clear:left;">Inherited Methods</div></th></tr>
......@@ -462,7 +470,9 @@ From <?cs var:cl.kind ?> <a href="<?cs var:toroot ?><?cs var:cl.link ?>"><?cs va
<?cs def:write_field_details(fields) ?>
<?cs each:field=fields ?>
<?cs # this next line must be exactly like this to be parsed by eclipse ?>
<div class="jd-details" id="<?cs var:field.anchor ?>">
<?cs # the A tag in the next line must remain where it is, so that Eclipse can parse the docs ?>
<A NAME="<?cs var:field.anchor ?>"></A>
<div class="jd-details">
<h4 class="jd-details-title">
<span class="normal">
<?cs var:field.scope ?>
......@@ -493,8 +503,9 @@ From <?cs var:cl.kind ?> <a href="<?cs var:toroot ?><?cs var:cl.link ?>"><?cs va
<?cs def:write_method_details(methods) ?>
<?cs each:method=methods ?>
<?cs # this next line must be exactly like this to be parsed by eclipse ?>
<div class="jd-details" id="<?cs var:method.anchor ?>">
<?cs # the A tag in the next line must remain where it is, so that Eclipse can parse the docs ?>
<A NAME="<?cs var:method.anchor ?>"></A>
<div class="jd-details">
<h4 class="jd-details-title">
<span class="normal">
<?cs var:method.scope ?>
......@@ -514,8 +525,9 @@ From <?cs var:cl.kind ?> <a href="<?cs var:toroot ?><?cs var:cl.link ?>"><?cs va
<?cs def:write_attr_details(attrs) ?>
<?cs each:attr=attrs ?>
<?cs # this next line must be exactly like this to be parsed by eclipse ?>
<div class="jd-details" id="<?cs var:attr.anchor ?>">
<?cs # the A tag in the next line must remain where it is, so that Eclipse can parse the docs ?>
<A NAME="<?cs var:attr.anchor ?>"></A>
<div class="jd-details">
<h4 class="jd-details-title"><?cs var:attr.name ?></h4>
<div class="jd-details-descr">
<?cs call:description(attr) ?>
......@@ -536,30 +548,40 @@ From <?cs var:cl.kind ?> <a href="<?cs var:toroot ?><?cs var:cl.link ?>"><?cs va
<!-- XML Attributes -->
<?cs if:subcount(class.attrs) ?>
<?cs # this next line must be exactly like this to be parsed by eclipse ?>
<!-- ========= FIELD DETAIL ======== -->
<h2>XML Attributes</h2>
<?cs call:write_attr_details(class.attrs) ?>
<?cs /if ?>
<!-- Enum Values -->
<?cs if:subcount(class.enumConstants) ?>
<?cs # this next line must be exactly like this to be parsed by eclipse ?>
<!-- ========= ENUM CONSTANTS DETAIL ======== -->
<h2>Enum Values</h2>
<?cs call:write_field_details(class.enumConstants) ?>
<?cs /if ?>
<!-- Constants -->
<?cs if:subcount(class.constants) ?>
<?cs # this next line must be exactly like this to be parsed by eclipse ?>
<!-- ========= ENUM CONSTANTS DETAIL ======== -->
<h2>Constants</h2>
<?cs call:write_field_details(class.constants) ?>
<?cs /if ?>
<!-- Fields -->
<?cs if:subcount(class.fields) ?>
<?cs # this next line must be exactly like this to be parsed by eclipse ?>
<!-- ========= FIELD DETAIL ======== -->
<h2>Fields</h2>
<?cs call:write_field_details(class.fields) ?>
<?cs /if ?>
<!-- Public ctors -->
<?cs if:subcount(class.ctors.public) ?>
<?cs # this next line must be exactly like this to be parsed by eclipse ?>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<h2>Public Constructors</h2>
<?cs call:write_method_details(class.ctors.public) ?>
<?cs /if ?>
......@@ -573,7 +595,7 @@ From <?cs var:cl.kind ?> <a href="<?cs var:toroot ?><?cs var:cl.link ?>"><?cs va
<?cs /if ?>
<?cs # this next line must be exactly like this to be parsed by eclipse ?>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<!-- ========= METHOD DETAIL ======== -->
<!-- Public methdos -->
<?cs if:subcount(class.methods.public) ?>
<h2>Public Methods</h2>
......@@ -587,8 +609,9 @@ From <?cs var:cl.kind ?> <a href="<?cs var:toroot ?><?cs var:cl.link ?>"><?cs va
<?cs call:write_method_details(class.methods.protected) ?>
<?cs /if ?>
<?cs # this next line must be exactly like this to be parsed by eclipse ?>
<?cs # the next two lines must be exactly like this to be parsed by eclipse ?>
<!-- ========= END OF CLASS DATA ========= -->
<A NAME="navbar_top"></A>
<?cs include:"footer.cs" ?>
</div> <!-- jd-content -->
......
tools/droiddoc/templates/customization.cs
View file @ 41977d7c
......@@ -2,25 +2,23 @@
<?cs # Use the -templatedir arg to javadoc to set your own directory with a ?>
<?cs # replacement for this file in it. ?>
<?cs def:custom_masthead() ?>
<div id="header">
<div id="headerLeft">
<a href="<?cs var:toroot ?>index.html" tabindex="-1"><?cs var:page.title ?></a>
</div>
<div id="headerRight">
<?cs call:default_search_box() ?>
</div><!-- headerRight -->
</div><!-- header -->
<?cs # appears at the top of every page ?><?cs
def:custom_masthead() ?>
<div id="header">
<div id="headerLeft">
<a href="<?cs var:toroot ?>index.html" tabindex="-1"><?cs var:page.title ?></a>
</div>
<div id="headerRight">
<?cs call:default_search_box() ?>
</div><!-- headerRight -->
</div><!-- header --><?cs
/def ?>
<?cs /def ?><?cs # custom_masthead ?>
<?cs # appears on the left side of the blue bar at the bottom of every page ?>
<?cs # appear at the bottom of every page ?>
<?cs def:custom_copyright() ?><?cs /def ?>
<?cs def:custom_cc_copyright() ?><?cs /def ?>
<?cs def:custom_footerlinks() ?><?cs /def ?>
<?cs # appears on the right side of the blue bar at the bottom of every page ?>
<?cs def:custom_buildinfo() ?>Build <?cs var:page.build ?> - <?cs var:page.now ?><?cs /def ?>
<?cs # appears on the side of the page ?>
<?cs def:custom_left_nav() ?><?cs call:default_left_nav() ?><?cs /def ?>
tools/droiddoc/templates/footer.cs
View file @ 41977d7c
......@@ -7,7 +7,7 @@
<div id="build_info">
<?cs call:custom_buildinfo() ?>
</div>
<?cs else ?>
<?cs elif:!hide_license_footer ?>
<div id="copyright">
<?cs call:custom_cc_copyright() ?>
</div>
......@@ -16,4 +16,4 @@
<?cs call:custom_footerlinks() ?>
</div>
</div> <!-- end footer -->
\ No newline at end of file
</div> <!-- end footer -->
tools/droiddoc/templates/head_tag.cs
View file @ 41977d7c
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="shortcut icon" type="image/x-icon" href="<?cs var:toroot ?>favicon.ico" />
<title><?cs var:page.title ?> | <?cs
if:guide ?>Guide | <?cs
elif:reference ?>Reference | <?cs
elif:sdk ?>SDK | <?cs
elif:sample ?>Samples | <?cs
/if ?>Android Developers</title>
<?cs if:guide||sdk ?>
<link href="<?cs var:toroot ?>assets/android-developer-docs-devguide.css" rel="stylesheet" type="text/css" />
<?cs else ?>
<link href="<?cs var:toroot ?>assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
<?cs /if ?>
<script src="<?cs var:toroot ?>assets/search_autocomplete.js"></script>
<script src="<?cs var:toroot ?>reference/lists.js"></script>
<script src="<?cs var:toroot ?>assets/jquery-resizable.min.js"></script>
<script src="<?cs var:toroot ?>assets/android-developer-docs.js"></script>
<script>
<title><?cs
if:page.title ?><?cs
var:page.title ?><?cs
if:sdk.version ?> (<?cs
var:sdk.version ?>)<?cs
/if ?> | <?cs
/if ?>Android Developers</title><?cs
if:guide||sdk ?>
<link href="<?cs var:toroot ?>assets/android-developer-docs-devguide.css" rel="stylesheet" type="text/css" /><?cs
else ?>
<link href="<?cs var:toroot ?>assets/android-developer-docs.css" rel="stylesheet" type="text/css" /><?cs
/if ?>
<script src="<?cs var:toroot ?>assets/search_autocomplete.js" type="text/javascript"></script>
<script src="<?cs var:toroot ?>reference/lists.js" type="text/javascript"></script>
<script src="<?cs var:toroot ?>assets/jquery-resizable.min.js" type="text/javascript"></script>
<script src="<?cs var:toroot ?>assets/android-developer-docs.js" type="text/javascript"></script>
<script type="text/javascript">
setToRoot("<?cs var:toroot ?>");
</script>
<script src="<?cs var:toroot ?>navtree_data.js"></script>
<script src="<?cs var:toroot ?>assets/navtree.js"></script>
</script><?cs
if:reference ?>
<script src="<?cs var:toroot ?>navtree_data.js" type="text/javascript"></script>
<script src="<?cs var:toroot ?>assets/navtree.js" type="text/javascript"></script><?cs
/if ?>
<noscript>
<style>
<style type="text/css">
body{overflow:auto;}
#body-content{position:relative; top:0;}
#doc-content{overflow:visible;border-left:3px solid #666;}
......
tools/droiddoc/templates/macros.cs
View file @ 41977d7c
This diff is collapsed.
tools/droiddoc/templates/nosidenavpage.cs
View file @ 41977d7c
......@@ -7,7 +7,7 @@
<?cs call:custom_masthead() ?>
<div id="body-content">
<div id="doc-content">
<div id="doc-content" style="position:relative;">
<?cs call:tag_list(root.descr) ?>
......
tools/droiddoc/templates/sample.cs
View file @ 41977d7c
......@@ -5,11 +5,15 @@
<?cs include:"head_tag.cs" ?>
<?cs include:"header.cs" ?>
<div class="g-unit" id="doc-content">
<div class="g-unit" id="doc-content"><a name="top"></a>
<div id="jd-header">
<div id="jd-header" class="guide-header">
<span class="crumb">
<a href="<?cs var:toroot ?>guide/samples/index.html">Sample Code &gt;</a>
</span>
<h1><?cs var:page.title ?></h1>
<?cs var:subdir ?>
</div>
<div id="jd-content">
......
tools/droiddoc/templates/sampleindex.cs
View file @ 41977d7c
......@@ -5,11 +5,15 @@
<?cs include:"head_tag.cs" ?>
<?cs include:"header.cs" ?>
<div class="g-unit" id="doc-content">
<div class="g-unit" id="doc-content"><a name="top"></a>
<div id="jd-header">
<h1><?cs var:projectTitle ?></h1>
<?cs var:subdir ?>
<div id="jd-header" class="guide-header">
<span class="crumb">
<a href="<?cs var:toroot ?>guide/samples/index.html">Sample Code &gt;</a>
</span>
<h1><?cs var:page.title ?></h1>
</div>
<div id="jd-content">
......@@ -20,7 +24,7 @@
<h2>Subdirectories</h2>
<ul class="nolist">
<?cs each:dir=subdirs ?>
<li><a href="<?cs var:dir.name ?>/"><?cs var:dir.name ?>/</a></li>
<li><a href="<?cs var:dir.name ?>/index.html"><?cs var:dir.name ?>/</a></li>
<?cs /each ?>
</ul>
<?cs /if ?>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment