merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
diff --git a/core/build_id.mk b/core/build_id.mk
index e1f97b5..09f1779 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -1,4 +1,3 @@
-
#
# Copyright (C) 2008 The Android Open Source Project
#
@@ -14,9 +13,20 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
+#
+# Defines branch-specific values.
+#
+
# BUILD_ID is usually used to specify the branch name
# (like "MAIN") or a branch name and a release candidate
-# (like "CRB01"). It must be a single word, and is
+# (like "TC1-RC5"). It must be a single word, and is
# capitalized by convention.
+#
+BUILD_ID := JB_MR1.1
-export BUILD_ID=JDP58
+# DISPLAY_BUILD_NUMBER should only be set for development branches,
+# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for
+# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY
+# is the same as BUILD_ID
+DISPLAY_BUILD_NUMBER := true
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 30bdc25..10d0cf6 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -112,6 +112,11 @@
a:focus,
a:active {
color: #33b5e5 !important; }
+
+a.external-link {
+ background:url('../images/styles/open_new_page.png') no-repeat 100% 50%;
+ padding-right:16px;
+}
img {
border: none; }
@@ -4277,11 +4282,16 @@
.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;
}
diff --git a/tools/droiddoc/templates-sdk/components/masthead.cs b/tools/droiddoc/templates-sdk/components/masthead.cs
index 025d076..d4697e3 100644
--- a/tools/droiddoc/templates-sdk/components/masthead.cs
+++ b/tools/droiddoc/templates-sdk/components/masthead.cs
@@ -23,7 +23,7 @@
es-lang="Diseñar"
>Design</a></li>
<li class="develop"><a href="<?cs var:toroot ?>develop/index.html" <?cs
- if:training || guide || reference || tools || develop ?>class="selected"<?cs /if ?>
+ if:training || guide || reference || tools || develop || google ?>class="selected"<?cs /if ?>
zh-TW-lang="開發"
zh-CN-lang="开发"
ru-lang="Разработка"
@@ -161,8 +161,9 @@
ja-lang="ツール"
es-lang="Herramientas"
>Tools</a>
- <ul><li><a href="<?cs var:toroot ?>sdk/index.html">Get the
-SDK</a></li></ul>
+ <ul><li><a href="<?cs var:toroot ?>sdk/index.html">Get the SDK</a></li></ul>
+ </li>
+ <li><a href="<?cs var:toroot ?>google/index.html">Google Services</a>
</li>
</ul>
</li>
@@ -191,11 +192,11 @@
-<?cs if:training || guide || reference || tools || develop ?>
+<?cs if:training || guide || reference || tools || develop || google ?>
<!-- Secondary x-nav -->
<div id="nav-x">
<div class="wrap">
- <ul class="nav-x col-9 develop" style="width:75%">
+ <ul class="nav-x col-9 develop" style="width:100%">
<li><a href="<?cs var:toroot ?>training/index.html" <?cs
if:training ?>class="selected"<?cs /if ?>
zh-TW-lang="訓練課程"
@@ -230,8 +231,12 @@
ru-lang="Инструменты"
ko-lang="도구"
ja-lang="ツール"
- es-lang="Herramientas"
+ es-lang="Herramientas"
>Tools</a></li>
+ <li><a href="<?cs var:toroot ?>google/index.html" <?cs
+ if:google ?>class="selected"<?cs /if ?>
+ >Google Services</a>
+ </li>
</ul>
</div>
diff --git a/tools/droiddoc/templates-sdk/customizations.cs b/tools/droiddoc/templates-sdk/customizations.cs
index 4ce01d7..eac4a2b 100644
--- a/tools/droiddoc/templates-sdk/customizations.cs
+++ b/tools/droiddoc/templates-sdk/customizations.cs
@@ -133,6 +133,27 @@
});
</script>
<?cs /def ?>
+
+<?cs
+def:google_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">
+<a class="totop" href="#top" data-g-event="left-nav-top">to top</a>
+
+<?cs
+ include:"../../../../frameworks/base/docs/html/google/google_toc.cs" ?>
+
+
+ </div>
+ </div> <!-- end side-nav -->
+ <script>
+ $(document).ready(function() {
+ scrollIntoView("devdoc-nav");
+ });
+ </script>
+<?cs /def ?>
+
<?cs
def:about_nav() ?>
<div class="wrap clearfix" id="body-content">
@@ -288,7 +309,7 @@
elif:tools ?><?cs
call:tools_nav() ?><?cs
elif:google ?><?cs
- call:dist_google_nav() ?><?cs
+ call:google_nav() ?><?cs
elif:more ?><?cs
call:dist_more_nav() ?><?cs
elif:distribute ?><?cs