merge in honeycomb-mr1-release history after reset to master
diff --git a/core/build_id.mk b/core/build_id.mk
index 2460fb1..40bb35d 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 := MASTER
-export BUILD_ID=HMI12
+# 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/core/java_library.mk b/core/java_library.mk
index abc4728..dbf6981 100644
--- a/core/java_library.mk
+++ b/core/java_library.mk
@@ -30,10 +30,12 @@
LOCAL_INTERMEDIATE_TARGETS += $(common_javalib.jar)
ifeq (true,$(WITH_DEXPREOPT))
+ifeq (,$(TARGET_BUILD_APPS))
ifndef LOCAL_DEX_PREOPT
LOCAL_DEX_PREOPT := true
endif
endif
+endif
#################################
include $(BUILD_SYSTEM)/java.mk
diff --git a/core/package.mk b/core/package.mk
index 4033f8d..57d6f4b 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -148,12 +148,14 @@
LOCAL_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_PROGUARD_FLAGS)
ifeq (true,$(WITH_DEXPREOPT))
+ifeq (,$(TARGET_BUILD_APPS))
ifneq (,$(LOCAL_SRC_FILES))
ifndef LOCAL_DEX_PREOPT
LOCAL_DEX_PREOPT := true
endif
endif
endif
+endif
# The dex files go in the package, so we don't
# want to install them separately for this module.
diff --git a/tools/droiddoc/templates-sdk/assets/android-developer-docs.css b/tools/droiddoc/templates-sdk/assets/android-developer-docs.css
index 957b2b0..1a35cbe 100644
--- a/tools/droiddoc/templates-sdk/assets/android-developer-docs.css
+++ b/tools/droiddoc/templates-sdk/assets/android-developer-docs.css
@@ -688,22 +688,6 @@
-webkit-border-radius:5px;
}
-.toggle-content-toggleme {
- display:none;
-}
-
-.toggle-content-button {
- font-size:.9em;
- line-height:.9em;
- text-decoration:none;
- position:relative;
- top:5px;
-}
-
-.toggle-content-button:hover {
- text-decoration:underline;
-}
-
div.special p {
margin: .5em 0 0 0;
}
@@ -840,6 +824,22 @@
margin: 0 0 0.5em 1em; /* matches default table left-margin */
}
+
+/* toggle for misc content (such as long sample code)
+ see toggleContent() script in android-developer-docs.js */
+.toggle-content.closed .toggle-content-toggleme {
+ display:none;
+}
+
+.toggle-content a[href="#"] {
+ text-decoration:none;
+}
+
+#jd-content .toggle-content img.toggle-content-img {
+ margin:0;
+}
+
+
/* BEGIN quickview sidebar element styles */
#qv-wrapper {
diff --git a/tools/droiddoc/templates-sdk/assets/android-developer-docs.js b/tools/droiddoc/templates-sdk/assets/android-developer-docs.js
index 19b7602..97b831a 100644
--- a/tools/droiddoc/templates-sdk/assets/android-developer-docs.js
+++ b/tools/droiddoc/templates-sdk/assets/android-developer-docs.js
@@ -575,16 +575,22 @@
}
+/* Used to hide and reveal supplemental content, such as long code samples.
+ See the companion CSS in android-developer-docs.css */
function toggleContent(obj) {
- var button = $(obj);
- var div = $(obj.parentNode);
+ var div = $(obj.parentNode.parentNode);
var toggleMe = $(".toggle-content-toggleme",div);
- if (button.hasClass("show")) {
+ if (div.hasClass("closed")) { // if it's closed, open it
toggleMe.slideDown();
- button.removeClass("show").addClass("hide");
- } else {
- toggleMe.slideUp();
- button.removeClass("hide").addClass("show");
+ $(".toggle-content-text", obj).toggle();
+ div.removeClass("closed").addClass("open");
+ $(".toggle-content-img", div).attr("title", "hide").attr("src", toRoot + "assets/images/triangle-opened.png");
+ } else { // if it's open, close it
+ toggleMe.slideUp('fast', function() { // Wait until the animation is done before closing arrow
+ $(".toggle-content-text", obj).toggle();
+ div.removeClass("open").addClass("closed");
+ $(".toggle-content-img", div).attr("title", "show").attr("src", toRoot + "assets/images/triangle-closed.png");
+ });
}
- $("span", button).toggle();
+ return false;
}
