Merge branch 'eclair' into eclair-release
diff --git a/cleanspec.mk b/cleanspec.mk
index 606775f..5bf4278 100644
--- a/cleanspec.mk
+++ b/cleanspec.mk
@@ -101,6 +101,10 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/core/Makefile b/core/Makefile
index 54b12ff..2f316ca 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1198,7 +1198,7 @@
$(PRIVATE_DIR)/platforms/android-$(PLATFORM_VERSION)/images/NOTICE.txt && \
cp -f $(tools_notice_file_txt) $(PRIVATE_DIR)/tools/NOTICE.txt && \
HOST_OUT_EXECUTABLES=$(HOST_OUT_EXECUTABLES) HOST_OS=$(HOST_OS) \
- development/tools/scripts/sdk_clean.sh $(PRIVATE_DIR) && \
+ development/build/tools/sdk_clean.sh $(PRIVATE_DIR) && \
chmod -R ug+rwX $(PRIVATE_DIR) && \
cd $(dir $@) && zip -rq $(notdir $@) $(PRIVATE_NAME) \
) || ( rm -rf $(PRIVATE_DIR) $@ && exit 44 )
diff --git a/core/main.mk b/core/main.mk
index 9986f94..f618194 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -354,9 +354,9 @@
dalvik/libdex \
dalvik/tools/dmtracedump \
dalvik/tools/hprof-conv \
- development/emulator/mksdcard \
development/tools/line_endings \
- development/tools/sdklauncher \
+ sdk/emulator/mksdcard \
+ sdk/sdklauncher \
development/host \
external/expat \
external/libpng \
@@ -380,18 +380,17 @@
build/tools/signapk \
dalvik/dx \
dalvik/libcore \
+ sdk/archquery \
+ sdk/androidprefs \
+ sdk/apkbuilder \
+ sdk/jarutils \
+ sdk/layoutlib_utils \
+ sdk/ninepatch \
+ sdk/sdkstats \
+ sdk/sdkmanager \
+ sdk/layoutopt \
development/apps \
- development/tools/archquery \
- development/tools/androidprefs \
- development/tools/apkbuilder \
- development/tools/jarutils \
- development/tools/layoutlib_utils \
- development/tools/ninepatch \
- development/tools/sdkstats \
- development/tools/sdkmanager \
development/tools/mkstubs \
- development/tools/layoutopt \
- frameworks/base \
frameworks/base/tools/layoutlib \
external/googleclient \
packages
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk
index dac4712..004c148 100644
--- a/core/tasks/cts.mk
+++ b/core/tasks/cts.mk
@@ -63,7 +63,7 @@
CtsUsePermissionDiffCert
CTS_CASE_LIST := \
- DeviceInfoCollector \
+ TestDeviceSetup \
CtsTestStubs \
CtsAppTestCases \
CtsContentTestCases \
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 913c6cd..33d7761 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -41,7 +41,7 @@
# which is the version that we reveal to the end user.
# Update this value when the platform version changes (rather
# than overriding it somewhere else). Can be an arbitrary string.
- PLATFORM_VERSION := 2.0.1
+ PLATFORM_VERSION := 2.1
endif
ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -53,7 +53,7 @@
# intermediate builds). During development, this number remains at the
# SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds
# the code-name of the new development work.
- PLATFORM_SDK_VERSION := 6
+ PLATFORM_SDK_VERSION := 7
endif
ifeq "" "$(PLATFORM_VERSION_CODENAME)"
diff --git a/tools/droiddoc/templates/assets/android-developer-core.css b/tools/droiddoc/templates/assets/android-developer-core.css
index 2b30c05..9530b2d 100644
--- a/tools/droiddoc/templates/assets/android-developer-core.css
+++ b/tools/droiddoc/templates/assets/android-developer-core.css
@@ -34,8 +34,7 @@
a, a code {
color:#006699;
-}
-
+}
a:active,
a:active code {
@@ -184,6 +183,7 @@
}
/* LAYOUT */
+
#body-content {
/* "Preliminary" watermark for preview releases and interim builds.
background:transparent url(images/preliminary.png) repeat scroll 0 0; */
@@ -218,6 +218,7 @@
}
/* Tabs in the header */
+
#header ul {
list-style: none;
margin: 7px 0 0;
@@ -261,7 +262,8 @@
display:none;
}
-/* TAB HIGHLIGHTING */
+/* tab highlighting */
+
.home #home-link a,
.guide #guide-link a,
.reference #reference-link a,
@@ -310,7 +312,7 @@
margin:15px 10px 0 0;
}
-/* main */
+/* MAIN BODY */
#mainBodyFluid {
margin: 20px 10px;
@@ -435,7 +437,8 @@
clear: both;
}
-/* Footer */
+/* FOOTER */
+
#footer {
float: left;
width:90%;
@@ -463,99 +466,8 @@
color:#006699;
}
-#homeBottom td {
- border:0px solid #666;
- padding: 8px 18px 8px 18px;
-}
-
-#homeBottom table {
- width: 100%;
-}
-
-
-#homeBottom {
- padding: 0px 0px 0px 0px;
- float: left;
- width: 585px;
- height: 165px;
- background-image:url(images/home/bg_home_bottom.jpg);
- background-repeat: no-repeat;
-}
-
-.groupTable {
- width: 100%;
-}
-
-.groupTable th {
- padding: 10px;
- color: #ffffff;
- background-color: #6D8293;
- border: 2px solid #fff;
-}
-
-.groupTable td {
- padding: 10px;
- color: #333333;
- background-color: #d9d9d9;
- border: 2px solid #fff;
-}
-
-.groupTable .evenRow td {
- background-color: #ededed;
-}
-
-span.BigBlue {
- color:#336666;
- font-size:1.25em;
- margin: 0em 0em 0em 0em;
- padding-bottom:.5em;
- font-weight: bold;
-}
-
-span.emBlue {
- color: #336666;
- font-style:italic;
-}
-
-.pageTable {
- width: 95%;
- border: none;
-}
-
-.pageTable img {
-vertical-align: bottom;
-}
-
-.pageTable td {
- border: none;
-}
-
-.pageTable td.leftNav {
- width: 100px;
-}
-
-.greenBox {
- margin: 10px 30px 10px 30px;
- padding: 10px 20px 10px 20px;
- background-color: #EBF3DB;
- width: 75%;
-}
-
-.blueBox {
- margin: 10px 30px 10px 30px;
- padding: 10px 20px 10px 20px;
- background-color: #DDF0F2;
- width: 75%;
-}
-
-.blueHR {
- margin: 10px 30px 10px 30px;
- height: 5px;
- background-color: #DDF0F2;
- width: 75%;
-}
-
/* SEARCH FILTER */
+
#search_autocomplete {
color:#aaa;
}
diff --git a/tools/droiddoc/templates/macros.cs b/tools/droiddoc/templates/macros.cs
index 0c59f32..b5fd3f2 100644
--- a/tools/droiddoc/templates/macros.cs
+++ b/tools/droiddoc/templates/macros.cs
@@ -62,12 +62,12 @@
each:tag = tags ?><?cs
if:tag.name == "Text" ?><?cs var:tag.text?><?cs
elif:tag.kind == "@more" ?><p><?cs
- elif:tag.kind == "@see" ?><a href="<?cs var:toroot ?><?cs var:tag.href ?>"><?cs var:tag.label ?></a><?cs
+ elif:tag.kind == "@see" ?><code><a href="<?cs var:toroot ?><?cs var:tag.href ?>"><?cs var:tag.label ?></a></code><?cs
elif:tag.kind == "@seeHref" ?><a href="<?cs var:tag.href ?>"><?cs var:tag.label ?></a><?cs
elif:tag.kind == "@seeJustLabel" ?><?cs var:tag.label ?><?cs
- elif:tag.kind == "@code" ?><code class="Code prettyprint"><?cs var:tag.text ?></code><?cs
- elif:tag.kind == "@samplecode" ?><pre class="Code prettyprint"><?cs var:tag.text ?></pre><?cs
- elif:tag.name == "@sample" ?><pre class="Code prettyprint"><?cs var:tag.text ?></pre><?cs
+ elif:tag.kind == "@code" ?><code><?cs var:tag.text ?></code><?cs
+ elif:tag.kind == "@samplecode" ?><pre><?cs var:tag.text ?></pre><?cs
+ elif:tag.name == "@sample" ?><pre><?cs var:tag.text ?></pre><?cs
elif:tag.name == "@include" ?><?cs var:tag.text ?><?cs
elif:tag.kind == "@docRoot" ?><?cs var:toroot ?><?cs
elif:tag.kind == "@sdkCurrent" ?><?cs var:sdk.current ?><?cs
@@ -121,8 +121,8 @@
<h5 class="jd-tagtitle">See Also</h5>
<ul class="nolist"><?cs
each:tag=also ?><li><?cs
- if:tag.kind == "@see" ?><a href="<?cs var:toroot ?><?cs var:tag.href ?>"><?cs
- var:tag.label ?></a><?cs
+ if:tag.kind == "@see" ?><code><a href="<?cs var:toroot ?><?cs var:tag.href ?>"><?cs
+ var:tag.label ?></a></code><?cs
elif:tag.kind == "@seeHref" ?><a href="<?cs var:tag.href ?>"><?cs var:tag.label ?></a><?cs
elif:tag.kind == "@seeJustLabel" ?><?cs var:tag.label ?><?cs
else ?>[ERROR: Unknown @see kind]<?cs