Merge "godir should set "T=$(gettop)""
diff --git a/cleanspec.mk b/cleanspec.mk
index 3a0bd8e..0951f8f 100644
--- a/cleanspec.mk
+++ b/cleanspec.mk
@@ -142,6 +142,7 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/QuickSearchBox.apk)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libdvm_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/speech)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email_intermediates)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/core/main.mk b/core/main.mk
index 134e844..f0ef602 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -395,6 +395,7 @@
sdk/androidprefs \
sdk/apkbuilder \
sdk/jarutils \
+ sdk/layoutlib_api \
sdk/layoutlib_utils \
sdk/ninepatch \
sdk/sdkstats \
diff --git a/target/product/generic.mk b/target/product/generic.mk
index 5887ae5..e312b1f 100644
--- a/target/product/generic.mk
+++ b/target/product/generic.mk
@@ -12,7 +12,6 @@
CertInstaller \
DrmProvider \
Email \
- Gallery \
LatinIME \
Mms \
Music \
diff --git a/tools/droiddoc/src/Errors.java b/tools/droiddoc/src/Errors.java
index 77852f8..7ba5623 100644
--- a/tools/droiddoc/src/Errors.java
+++ b/tools/droiddoc/src/Errors.java
@@ -115,7 +115,7 @@
public static Error DEPRECATION_MISMATCH = new Error(13, WARNING);
public static Error MISSING_COMMENT = new Error(14, WARNING);
public static Error IO_ERROR = new Error(15, HIDDEN);
- public static Error NO_SINCE_DATA = new Error(16, WARNING);
+ public static Error NO_SINCE_DATA = new Error(16, HIDDEN);
public static Error[] ERRORS = {
UNRESOLVED_LINK,
diff --git a/tools/droiddoc/templates/assets/android-developer-core.css b/tools/droiddoc/templates/assets/android-developer-core.css
index a6e765b..2d1708a 100644
--- a/tools/droiddoc/templates/assets/android-developer-core.css
+++ b/tools/droiddoc/templates/assets/android-developer-core.css
@@ -659,7 +659,7 @@
padding: 0px 0px 0px 0px;
float: left;
width: 584px;
- height: 580px;
+ height: 627px;
position:relative;
}
diff --git a/tools/droiddoc/templates/assets/images/home/Android_Dev_Lab_l.png b/tools/droiddoc/templates/assets/images/home/Android_Dev_Lab_l.png
new file mode 100644
index 0000000..3c04f24
--- /dev/null
+++ b/tools/droiddoc/templates/assets/images/home/Android_Dev_Lab_l.png
Binary files differ
diff --git a/tools/droiddoc/templates/assets/images/home/adc2_l.png b/tools/droiddoc/templates/assets/images/home/adc2_l.png
new file mode 100644
index 0000000..0b101a4
--- /dev/null
+++ b/tools/droiddoc/templates/assets/images/home/adc2_l.png
Binary files differ
diff --git a/tools/droiddoc/templates/assets/images/home/adc2_s.png b/tools/droiddoc/templates/assets/images/home/adc2_s.png
new file mode 100644
index 0000000..0d36bdb
--- /dev/null
+++ b/tools/droiddoc/templates/assets/images/home/adc2_s.png
Binary files differ
diff --git a/tools/droiddoc/templates/assets/search_autocomplete.js b/tools/droiddoc/templates/assets/search_autocomplete.js
index 086674a..4fa47a5 100644
--- a/tools/droiddoc/templates/assets/search_autocomplete.js
+++ b/tools/droiddoc/templates/assets/search_autocomplete.js
@@ -107,11 +107,13 @@
var text = search.value;
// 13 = enter
- if (!kd && (e.keyCode == 13)) {
+ if (e.keyCode == 13) {
document.getElementById("search_filtered_div").className = "no-display";
- if (gSelectedIndex >= 0) {
+ if (kd && gSelectedIndex >= 0) {
window.location = toroot + gMatches[gSelectedIndex].link;
return false;
+ } else if (gSelectedIndex < 0) {
+ return true;
}
}
// 38 -- arrow up
