merge in jb-mr2-release history after reset to jb-mr2-dev
diff --git a/core/build_id.mk b/core/build_id.mk
index cb3b417..ffff91e 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -13,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_MR2
-export BUILD_ID=JWR44
+# 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 1b585cb..b9de504 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -2614,6 +2614,39 @@
background-image: url(../images/styles/disclosure_up.png);
}
+/* notice sidebox link used in Design docs */
+a.notice-developers {
+ float:right;
+ width:240px;
+ min-height:50px;
+ margin:0 0 20px 20px;
+ border:1px solid #ddd;
+}
+a.notice-developers div {
+ min-height:40px;
+ background:url('../images/styles/notice-developers.png') no-repeat 10px 10px;
+ padding:10px 10px 10px 60px;
+}
+a.notice-developers:hover {
+ background:#eee;
+}
+a.notice-developers h3 {
+ font-size:14px;
+ font-weight:normal;
+ text-transform:uppercase;
+ color:#000 !important;
+ margin:0;
+}
+a.notice-developers p {
+ margin:0;
+ line-height:16px;
+}
+a.notice-developers.left {
+ margin-left:0;
+ float:left;
+}
+
+
/* -----------------------------------------------
good/bad example containers
*/
diff --git a/tools/droiddoc/templates-sdk/assets/images/styles/notice-developers.png b/tools/droiddoc/templates-sdk/assets/images/styles/notice-developers.png
new file mode 100644
index 0000000..dd04606
--- /dev/null
+++ b/tools/droiddoc/templates-sdk/assets/images/styles/notice-developers.png
Binary files differ
