merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
diff --git a/core/build_id.mk b/core/build_id.mk
index 1842498..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=JSS08
+# 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/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 194fb7a..18991b0 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -49,6 +49,7 @@
PRODUCT_PACKAGES += \
audio \
clatd \
+ clatd.conf \
dhcpcd.conf \
network \
pand \
diff --git a/tools/droiddoc/templates-ds/assets/css/default.css b/tools/droiddoc/templates-ds/assets/css/default.css
index da06e31..5bd95a8 100644
--- a/tools/droiddoc/templates-ds/assets/css/default.css
+++ b/tools/droiddoc/templates-ds/assets/css/default.css
@@ -2393,6 +2393,30 @@
}
/* --------------------------------------------------------------------------
+Butterbar
+*/
+#butterbar-wrapper {
+ position:absolute;
+ top:0;
+ left:0;
+ width:100%;
+}
+#butterbar {
+ width:940px;
+ margin:0 auto;
+}
+#butterbar-message {
+ background-color:#f80;
+ float:right;
+ font-size:12px;
+ font-weight:bold;
+ padding:0 10px;
+ border-radius: 0 0 5px 5px;
+}
+#butterbar-message a {color:#fff !important}
+#butterbar-message a:hover {text-decoration:underline;}
+
+/* --------------------------------------------------------------------------
Misc
*/
diff --git a/tools/droiddoc/templates-sac/assets/css/default.css b/tools/droiddoc/templates-sac/assets/css/default.css
index 11bba80..0d9e601 100644
--- a/tools/droiddoc/templates-sac/assets/css/default.css
+++ b/tools/droiddoc/templates-sac/assets/css/default.css
@@ -2461,6 +2461,30 @@
}
/* --------------------------------------------------------------------------
+Butterbar
+*/
+#butterbar-wrapper {
+ position:absolute;
+ top:0;
+ left:0;
+ width:100%;
+}
+#butterbar {
+ width:940px;
+ margin:0 auto;
+}
+#butterbar-message {
+ background-color:#f80;
+ float:right;
+ font-size:12px;
+ font-weight:bold;
+ padding:0 10px;
+ border-radius: 0 0 5px 5px;
+}
+#butterbar-message a {color:#fff !important}
+#butterbar-message a:hover {text-decoration:underline;}
+
+/* --------------------------------------------------------------------------
Misc
*/
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 865e8506..f71d0a0 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -1788,11 +1788,13 @@
font-size:inherit;
}
-#tb .download-box {
+#tb .download-box,
+#qv .download-box {
padding:0 0 0 15px;
}
-#tb .download-box .filename {
+#tb .download-box .filename,
+#qv .download-box .filename {
font-size:11px;
margin:4px 4px 10px;
color:#666;
@@ -2433,6 +2435,30 @@
}
/* --------------------------------------------------------------------------
+Butterbar
+*/
+#butterbar-wrapper {
+ position:absolute;
+ top:0;
+ left:0;
+ width:100%;
+}
+#butterbar {
+ width:940px;
+ margin:0 auto;
+}
+#butterbar-message {
+ background-color:#f80;
+ float:right;
+ font-size:12px;
+ font-weight:bold;
+ padding:0 10px;
+ border-radius: 0 0 5px 5px;
+}
+#butterbar-message a {color:#fff !important}
+#butterbar-message a:hover {text-decoration:underline;}
+
+/* --------------------------------------------------------------------------
Misc
*/
