Merge "Setting PLATFORM_VERSION(_CODENAME)? to NMR1" into nyc-mr1-dev
diff --git a/core/definitions.mk b/core/definitions.mk
index a63ea75..1808101 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2449,10 +2449,14 @@
# decimal number) instead. If the APK does not specify a minSdkVersion, returns
# 0 to match how the Android platform interprets this situation at runtime.
#
+# This currently substitutes any version which contains characters other than
+# digits with the current platform's API Level number. This is because I
+# couldn't figure out an easy way to perform the substitution only for the
+# version codes listed in PLATFORM_VERSION_ALL_CODENAMES.
define get-package-min-sdk-version-int
$$(($(AAPT) dump badging $(1) 2>&1 | grep '^sdkVersion' || echo "sdkVersion:'0'") \
| cut -d"'" -f2 | \
- sed -e s/^$(PLATFORM_VERSION_CODENAME)$$/$(PLATFORM_SDK_VERSION)/)
+ sed -e s/^.*[^0-9].*$$/$(PLATFORM_SDK_VERSION)/)
endef
# Sign a package using the specified key/cert.
diff --git a/tools/droiddoc/templates-sdk-dev/customizations.cs b/tools/droiddoc/templates-sdk-dev/customizations.cs
index d5a6960..44ae239 100644
--- a/tools/droiddoc/templates-sdk-dev/customizations.cs
+++ b/tools/droiddoc/templates-sdk-dev/customizations.cs
@@ -182,6 +182,8 @@
<?cs include:"../../../../frameworks/base/docs/html/samples/samples_toc.cs" ?>
<?cs elif:preview ?>
<?cs include:"../../../../frameworks/base/docs/html/preview/preview_toc.cs" ?>
+ <?cs elif:preview ?>
+ <?cs include:"../../../../frameworks/base/docs/html/wear/preview/preview_toc.cs" ?>
<?cs elif:distribute ?>
<?cs if:googleplay ?>
<?cs include:"../../../../frameworks/base/docs/html/distribute/googleplay/googleplay_toc.cs" ?>
diff --git a/tools/droiddoc/templates-sdk-dev/docpage.cs b/tools/droiddoc/templates-sdk-dev/docpage.cs
index 3d17d37..0f1d4e0 100644
--- a/tools/droiddoc/templates-sdk-dev/docpage.cs
+++ b/tools/droiddoc/templates-sdk-dev/docpage.cs
@@ -120,15 +120,6 @@
<h1 itemprop="name"><?cs var:projectDir ?></h1>
<?cs else ?>
- <?cs if:training ?>
-<?cs # horrible horrible hack to move TOC up when the next/prev links are not there ?>
-<style>
- #tb-wrapper {
- margin-top:6px;
- }
-</style>
- <?cs /if ?>
-
<?cs if:(!fullpage && !header.hide && !devsite) ?>
<?cs if:page.landing ?><?cs # header logic for docs that are landing pages ?>
<div class="landing-banner">
diff --git a/tools/droiddoc/templates-sdk-dev/head_tag.cs b/tools/droiddoc/templates-sdk-dev/head_tag.cs
index 7cf078a..3629045 100644
--- a/tools/droiddoc/templates-sdk-dev/head_tag.cs
+++ b/tools/droiddoc/templates-sdk-dev/head_tag.cs
@@ -5,7 +5,7 @@
if:devsite ?>
<meta name="top_category" value="<?cs
if:ndk ?>ndk<?cs
- elif:(guide||develop||training||reference||tools||sdk||google||reference.gms||reference.gcm||samples) ?>develop<?cs
+ elif:(guide||develop||training||reference||tools||sdk||google||reference.gms||reference.gcm||samples||wearpreview) ?>develop<?cs
elif:(topic||libraries) ?>develop<?cs
elif:(distribute||googleplay||essentials||users||engage||monetize||disttools||stories||analyze) ?>distribute<?cs
elif:(design||vision||material||patterns||devices||designdownloads) ?>design<?cs
@@ -48,6 +48,7 @@
else ?>none<?cs set:dac_subcategory_set = #0 ?><?cs /if ?><?cs
elif:(about||versions||wear||tv||auto) ?>about<?cs
elif:preview ?>preview<?cs
+ elif:wearpreview ?>wearpreview<?cs
elif:design ?>design<?cs
elif:walkthru ?>walkthru<?cs
else ?>none<?cs set:dac_subcategory_set = #0 ?><?cs /if ?><?cs
@@ -82,6 +83,7 @@
elif:analyze ?>/analyze<?cs /if ?><?cs
elif:(about||versions||wear||tv||auto) ?>/about<?cs
elif:preview ?>/preview<?cs
+ elif:wearpreview ?>/wear/preview<?cs
elif:design ?>/design<?cs
elif:reference.testSupport ?>/reference/android/support/test<?cs
elif:reference.wearableSupport ?>/reference/android/support/wearable<?cs
diff --git a/tools/droiddoc/templates-sdk-dev/lists.cs b/tools/droiddoc/templates-sdk-dev/lists.cs
new file mode 100644
index 0000000..ede8c43
--- /dev/null
+++ b/tools/droiddoc/templates-sdk-dev/lists.cs
@@ -0,0 +1,8 @@
+var <?cs
+ if:reference.testSupport ?>SUPPORT_TEST_<?cs
+ elif: reference.wearableSupport ?>SUPPORT_WEARABLE_<?cs
+ /if ?>DATA = [
+<?cs each:page = docs.pages
+?> { id:<?cs var: page.id ?>, label:"<?cs var:page.label ?>", link:"<?cs var:page.link ?>", type:"<?cs var:page.type ?>", deprecated:"<?cs var:page.deprecated ?>" }<?cs if:!last(page) ?>,<?cs /if ?>
+<?cs /each ?>
+ ];