diff --git a/cleanspec.mk b/cleanspec.mk index 75f83bfb02..69dffdeafc 100644 --- a/cleanspec.mk +++ b/cleanspec.mk @@ -60,6 +60,11 @@ $(call add-clean-step, rm -f $(PRODUCT_OUT)/system/etc/NOTICE.html) $(call add-clean-step, find $(OUT_DIR) -type f -name "*.java" -print0 | xargs -0 rm -f) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/sapphire/obj/SHARED_LIBRARIES/libhardware_legacy_intermediates/led) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/mountd) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/mountd.conf) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Browser_intermediates) +$(call add-clean-step, rm -f vendor/google/apps/Talk/res/drawable/%*) +$(call add-clean-step, rm -rf $(OUT_DIR)/product/*/obj/SHARED_LIBRARIES/libandroid_runtime_intermediates/android_os_NetStat.o) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST diff --git a/core/Makefile b/core/Makefile index d8af02cc96..ca2b1437e0 100644 --- a/core/Makefile +++ b/core/Makefile @@ -109,6 +109,7 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) PRODUCT_MANUFACTURER="$(PRODUCT_MANUFACTURER)" \ PRIVATE_BUILD_DESC="$(PRIVATE_BUILD_DESC)" \ BUILD_ID="$(BUILD_ID)" \ + BUILD_DISPLAY_ID="$(BUILD_DISPLAY_ID)" \ BUILD_NUMBER="$(BUILD_NUMBER)" \ PLATFORM_VERSION="$(PLATFORM_VERSION)" \ PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \ @@ -559,6 +560,7 @@ ifeq ($(TARGET_USERIMAGES_USE_EXT2),true) ## Generate an ext2 image define build-userdataimage-target $(call pretty,"Target userdata fs image: $(INSTALLED_USERDATAIMAGE_TARGET)") + @mkdir -p $(TARGET_OUT_DATA) $(call build-userimage-ext2-target,$(TARGET_OUT_DATA),$(INSTALLED_USERDATAIMAGE_TARGET),userdata,) $(hide) $(call assert-max-file-size,$(INSTALLED_USERDATAIMAGE_TARGET),$(BOARD_USERDATAIMAGE_MAX_SIZE)) endef @@ -568,6 +570,7 @@ else # TARGET_USERIMAGES_USE_EXT2 != true ## Generate a yaffs2 image define build-userdataimage-target $(call pretty,"Target userdata fs image: $(INSTALLED_USERDATAIMAGE_TARGET)") + @mkdir -p $(TARGET_OUT_DATA) $(hide) $(MKYAFFS2) -f $(TARGET_OUT_DATA) $(INSTALLED_USERDATAIMAGE_TARGET) $(hide) $(call assert-max-file-size,$(INSTALLED_USERDATAIMAGE_TARGET),$(BOARD_USERDATAIMAGE_MAX_SIZE)) endef diff --git a/core/build_id.mk b/core/build_id.mk index 9899dd4458..cb18bc4924 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -23,4 +23,10 @@ # (like "TC1-RC5"). It must be a single word, and is # capitalized by convention. # -BUILD_ID := MAIN +BUILD_ID := CUPCAKE + +# 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/cleanbuild.mk b/core/cleanbuild.mk index b2e04a7ddb..0b292bfa94 100644 --- a/core/cleanbuild.mk +++ b/core/cleanbuild.mk @@ -84,3 +84,111 @@ $(shell \ clean_steps_file := INTERNAL_CLEAN_STEPS := INTERNAL_CLEAN_BUILD_VERSION := + + +# Since products and build variants (unfortunately) share the same +# PRODUCT_OUT staging directory, things can get out of sync if different +# build configurations are built in the same tree. The following logic +# will notice when the configuration has changed and remove the files +# necessary to keep things consistent. + +previous_build_config_file := $(PRODUCT_OUT)/previous_build_config.mk + +# TODO: this special case for the sdk is only necessary while "sdk" +# is a valid make target. Eventually, it will just be a product, at +# which point TARGET_PRODUCT will handle it and we can avoid this check +# of MAKECMDGOALS. The "addprefix" is just to keep things pretty. +ifneq ($(TARGET_PRODUCT),sdk) + building_sdk := $(addprefix -,$(filter sdk,$(MAKECMDGOALS))) +else + # Don't bother with this extra part when explicitly building the sdk product. + building_sdk := +endif +current_build_config := $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)$(building_sdk) +building_sdk := +force_installclean := false + +# Read the current state from the file, if present. +# Will set PREVIOUS_BUILD_CONFIG. +# +PREVIOUS_BUILD_CONFIG := +-include $(previous_build_config_file) +PREVIOUS_BUILD_CONFIG := $(strip $(PREVIOUS_BUILD_CONFIG)) +ifdef PREVIOUS_BUILD_CONFIG + ifneq "$(current_build_config)" "$(PREVIOUS_BUILD_CONFIG)" + $(info *** Build configuration changed: "$(PREVIOUS_BUILD_CONFIG)" -> "$(current_build_config)") + force_installclean := true + endif +endif # else, this is the first build, so no need to clean. +PREVIOUS_BUILD_CONFIG := + +# Write the new state to the file. +# +$(shell \ + mkdir -p $(dir $(previous_build_config_file)) && \ + echo "PREVIOUS_BUILD_CONFIG := $(current_build_config)" > \ + $(previous_build_config_file) \ + ) +previous_build_config_file := +current_build_config := + +# +# installclean logic +# + +# The files/dirs to delete during an installclean. This includes the +# non-common APPS directory, which may contain the wrong resources. +# Use "./" in front of the paths to avoid accidentally deleting random +# parts of the filesystem if any of the *_OUT vars resolve to blank. +# +# Deletes all of the files that change between different build types, +# like "make user" vs. "make sdk". This lets you work with different +# build types without having to do a full clean each time. E.g.: +# +# $ make -j8 all +# $ make installclean +# $ make -j8 user +# $ make installclean +# $ make -j8 sdk +# +installclean_files := \ + ./$(HOST_OUT)/obj/NOTICE_FILES \ + ./$(HOST_OUT)/sdk \ + ./$(PRODUCT_OUT)/*.img \ + ./$(PRODUCT_OUT)/*.txt \ + ./$(PRODUCT_OUT)/*.xlb \ + ./$(PRODUCT_OUT)/*.zip \ + ./$(PRODUCT_OUT)/data \ + ./$(PRODUCT_OUT)/obj/APPS \ + ./$(PRODUCT_OUT)/obj/NOTICE_FILES \ + ./$(PRODUCT_OUT)/obj/PACKAGING \ + ./$(PRODUCT_OUT)/recovery \ + ./$(PRODUCT_OUT)/root \ + ./$(PRODUCT_OUT)/system + +# The files/dirs to delete during a dataclean, which removes any files +# in the staging and emulator data partitions. +dataclean_files := \ + ./$(PRODUCT_OUT)/data/* \ + ./$(PRODUCT_OUT)/data-qemu/* \ + ./$(PRODUCT_OUT)/userdata-qemu.img + +# Define the rules for commandline invocation. +.PHONY: dataclean +dataclean: FILES := $(dataclean_files) +dataclean: + $(hide) rm -rf $(FILES) + @echo "Deleted emulator userdata images." + +.PHONY: installclean +installclean: FILES := $(installclean_files) +installclean: dataclean + $(hide) rm -rf $(FILES) + @echo "Deleted images and staging directories." + +ifeq "$(force_installclean)" "true" + $(info *** Forcing "make installclean"...) + $(shell rm -rf $(dataclean_files) $(installclean_files)) + $(info *** Done with the cleaning, now starting the real build.) +endif +force_installclean := diff --git a/core/config.mk b/core/config.mk index 90e536273c..90a40a7314 100644 --- a/core/config.mk +++ b/core/config.mk @@ -20,6 +20,7 @@ SRC_HEADERS := \ $(TOPDIR)hardware/ril/include \ $(TOPDIR)dalvik/libnativehelper/include \ $(TOPDIR)frameworks/base/include \ + $(TOPDIR)frameworks/base/opengl/include \ $(TOPDIR)external/skia/include SRC_HOST_HEADERS:=$(TOPDIR)tools/include SRC_LIBRARIES:= $(TOPDIR)libs @@ -87,6 +88,8 @@ COMMON_PACKAGE_SUFFIX := .zip COMMON_JAVA_PACKAGE_SUFFIX := .jar COMMON_ANDROID_PACKAGE_SUFFIX := .apk +# list of flags to turn specific warnings in to errors +TARGET_ERROR_FLAGS := -Werror=return-type # ############################################################### # Include sub-configuration files @@ -245,6 +248,16 @@ TARGET_GLOBAL_LD_DIRS += -L$(TARGET_OUT_INTERMEDIATE_LIBRARIES) HOST_PROJECT_INCLUDES:= $(SRC_HEADERS) $(SRC_HOST_HEADERS) $(HOST_OUT_HEADERS) TARGET_PROJECT_INCLUDES:= $(SRC_HEADERS) $(TARGET_OUT_HEADERS) +# Many host compilers don't support these flags, so we have to make +# sure to only specify them for the target compilers checked in to +# the source tree. The simulator uses the target flags but the +# host compiler, so only set them for the target when the target +# is not the simulator. +ifneq ($(TARGET_SIMULATOR),true) +TARGET_GLOBAL_CFLAGS += $(TARGET_ERROR_FLAGS) +TARGET_GLOBAL_CPPFLAGS += $(TARGET_ERROR_FLAGS) +endif + ifeq ($(HOST_BUILD_TYPE),release) HOST_GLOBAL_CFLAGS+= $(HOST_RELEASE_CFLAGS) HOST_GLOBAL_CPPFLAGS+= $(HOST_RELEASE_CPPFLAGS) diff --git a/core/distdir.mk b/core/distdir.mk index 777242b9d8..e04938bf7a 100644 --- a/core/distdir.mk +++ b/core/distdir.mk @@ -46,13 +46,20 @@ endef # and "dist" is specified, the marked files will be copied to DIST_DIR. # # $(1): a list of goals (e.g. droid, sdk, pdk, ndk) -# $(2): the dist files to add to those goals +# $(2): the dist files to add to those goals. If the file contains ':', +# the text following the colon is the name that the file is copied +# to under the dist directory. Subdirs are ok, and will be created +# at copy time if necessary. define dist-for-goals $(foreach file,$(2), \ + $(eval fw := $(subst :,$(space),$(file))) \ + $(eval src := $(word 1,$(fw))) \ + $(eval dst := $(word 2,$(fw))) \ + $(eval dst := $(if $(dst),$(dst),$(notdir $(src)))) \ $(eval \ $(call copy-one-dist-file, \ - $(file), \ - $(DIST_DIR)/$(notdir $(file)), \ + $(src), \ + $(DIST_DIR)/$(dst), \ $(1) \ ) \ ) \ diff --git a/core/main.mk b/core/main.mk index 216225b680..a1374a23eb 100644 --- a/core/main.mk +++ b/core/main.mk @@ -325,10 +325,6 @@ else # !BUILD_TINY_ANDROID # INTERNAL_DEFAULT_DOCS_TARGETS := offline-sdk-docs subdirs := $(TOP) -# Only include Android.mk files directly under vendor/*, not -# *all* Android.mk files under vendor (which is what would happen -# if we didn't prune vendor in the findleaves call). -subdir_makefiles += $(wildcard vendor/*/Android.mk) FULL_BUILD := true @@ -339,8 +335,7 @@ endif # !SDK_ONLY # Can't use first-makefiles-under here because # --mindepth=2 makes the prunes not work. subdir_makefiles += \ - $(shell build/tools/findleaves.sh \ - --prune="./vendor" --prune="./out" $(subdirs) Android.mk) + $(shell build/tools/findleaves.sh --prune="./out" $(subdirs) Android.mk) # Boards may be defined under $(SRC_TARGET_DIR)/board/$(TARGET_DEVICE) # or under vendor/*/$(TARGET_DEVICE). Search in both places, but @@ -632,40 +627,7 @@ clobber: @rm -rf $(OUT_DIR) @echo "Entire build directory removed." -.PHONY: dataclean -dataclean: - @rm -rf $(PRODUCT_OUT)/data/* - @rm -rf $(PRODUCT_OUT)/data-qemu/* - @rm -rf $(PRODUCT_OUT)/userdata-qemu.img - @echo "Deleted emulator userdata images." - -.PHONY: installclean -# Deletes all of the files that change between different build types, -# like "make user" vs. "make sdk". This lets you work with different -# build types without having to do a full clean each time. E.g.: -# -# $ make -j8 all -# $ make installclean -# $ make -j8 user -# $ make installclean -# $ make -j8 sdk -# -installclean: dataclean - $(hide) rm -rf ./$(PRODUCT_OUT)/system - $(hide) rm -rf ./$(PRODUCT_OUT)/recovery - $(hide) rm -rf ./$(PRODUCT_OUT)/data - $(hide) rm -rf ./$(PRODUCT_OUT)/root - $(hide) rm -rf ./$(PRODUCT_OUT)/obj/NOTICE_FILES - @# Remove APPS because they may contain the wrong resources. - $(hide) rm -rf ./$(PRODUCT_OUT)/obj/APPS - $(hide) rm -rf ./$(HOST_OUT)/obj/NOTICE_FILES - $(hide) rm -rf ./$(HOST_OUT)/sdk - $(hide) rm -rf ./$(PRODUCT_OUT)/obj/PACKAGING - $(hide) rm -f ./$(PRODUCT_OUT)/*.img - $(hide) rm -f ./$(PRODUCT_OUT)/*.zip - $(hide) rm -f ./$(PRODUCT_OUT)/*.txt - $(hide) rm -f ./$(PRODUCT_OUT)/*.xlb - @echo "Deleted images and staging directories." +# The rules for dataclean and installclean are defined in cleanbuild.mk. #xxx scrape this from ALL_MODULE_NAME_TAGS .PHONY: modules diff --git a/core/package.mk b/core/package.mk index 32f394f55a..a212553396 100644 --- a/core/package.mk +++ b/core/package.mk @@ -69,6 +69,7 @@ ifeq (,$(LOCAL_RESOURCE_DIR)) endif LOCAL_RESOURCE_DIR := \ $(wildcard $(addsuffix /$(LOCAL_RESOURCE_DIR), $(PRODUCT_PACKAGE_OVERLAYS))) \ + $(wildcard $(addsuffix /$(LOCAL_RESOURCE_DIR), $(DEVICE_PACKAGE_OVERLAYS))) \ $(LOCAL_RESOURCE_DIR) # this is an app, so add the system libraries to the search path diff --git a/core/prelink-linux-arm.map b/core/prelink-linux-arm.map index 413dcc4f4f..3ac09a4600 100644 --- a/core/prelink-linux-arm.map +++ b/core/prelink-linux-arm.map @@ -52,7 +52,13 @@ libpixelflinger.so 0xACF00000 libcorecg.so 0xACE00000 libsurfaceflinger.so 0xACD00000 libagl.so 0xACC00000 -libGLES_CM.so 0xACB00000 + +libGLESv1_CM.so 0xACB00000 +libGLESv2.so 0xACA00000 +libOpenVG_CM.so 0xAC900000 +libOpenVGU_CM.so 0xAC800000 +libEGL.so 0xAC700000 + libexif.so 0xAC500000 libui.so 0xAC400000 libsgl.so 0xAC000000 @@ -98,6 +104,14 @@ libopencoremp4.so 0xA7400000 libopencoremp4reg.so 0xA7300000 libopencoreplayer.so 0xA7000000 +# opencore hardware support +libmm-adspsvc.so 0xA6FFD000 +libOmxCore.so 0xA6FF0000 +libOmxMpeg4Dec.so 0xA6FC0000 +libOmxH264Dec.so 0xA6F90000 +libOmxVidEnc.so 0xA6F60000 +libopencorehw.so 0xA6F50000 + # libraries for specific apps or temporary libraries libcam_ipl.so 0x9F000000 libwbxml.so 0x9E800000 diff --git a/core/product.mk b/core/product.mk index 08019e8528..8f5dc7b8a8 100644 --- a/core/product.mk +++ b/core/product.mk @@ -23,14 +23,8 @@ # $(call ) isn't necessary. # define _find-android-products-files -$(foreach vendor,$(wildcard vendor/*), \ - $(if $(wildcard $(vendor)/AndroidProducts.mk), \ - $(vendor)/AndroidProducts.mk \ - , \ - $(wildcard $(vendor)/*/AndroidProducts.mk) \ - ) \ - ) \ - $(wildcard $(SRC_TARGET_DIR)/product/AndroidProducts.mk) +$(shell test -d vendor && find vendor -maxdepth 6 -name AndroidProducts.mk) \ + $(SRC_TARGET_DIR)/product/AndroidProducts.mk endef # @@ -67,7 +61,10 @@ _product_var_list := \ PRODUCT_COPY_FILES \ PRODUCT_OTA_PUBLIC_KEYS \ PRODUCT_POLICY \ - PRODUCT_PACKAGE_OVERLAYS + PRODUCT_PACKAGE_OVERLAYS \ + DEVICE_PACKAGE_OVERLAYS \ + PRODUCT_CONTRIBUTORS_FILE \ + PRODUCT_TAGS define dump-product $(info ==== $(1) ====)\ diff --git a/core/product_config.mk b/core/product_config.mk index 436f9f69fd..a9021cccca 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -181,6 +181,10 @@ PRODUCT_POLICY := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_POLICY)) PRODUCT_COPY_FILES := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_COPY_FILES)) +# The HTML file containing the contributors to the project. +PRODUCT_CONTRIBUTORS_FILE := \ + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_CONTRIBUTORS_FILE)) + # A list of property assignments, like "key = value", with zero or more # whitespace characters on either side of the '='. PRODUCT_PROPERTY_OVERRIDES := \ @@ -189,6 +193,11 @@ PRODUCT_PROPERTY_OVERRIDES := \ # Should we use the default resources or add any product specific overlays PRODUCT_PACKAGE_OVERLAYS := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGE_OVERLAYS)) +DEVICE_PACKAGE_OVERLAYS := \ + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).DEVICE_PACKAGE_OVERLAYS)) + +# An list of whitespace-separated words. +PRODUCT_TAGS := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_TAGS)) # Add the product-defined properties to the build properties. ADDITIONAL_BUILD_PROPERTIES := \ diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index 6f1b94a1a8..fe54d04f1e 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -43,9 +43,18 @@ CTS_HOST_JAR := $(HOST_OUT_JAVA_LIBRARIES)/cts.jar CTS_CASE_LIST := \ DeviceInfoCollector \ CtsTestStubs \ - CtsTextTestCases \ - CtsViewTestCases \ + CtsAppTestCases \ + CtsContentTestCases \ + CtsDatabaseTestCases \ CtsGraphicsTestCases \ + CtsLocationTestCases \ + CtsNetTestCases \ + CtsOsTestCases \ + CtsProviderTestCases \ + CtsTextTestCases \ + CtsUtilTestCases \ + CtsViewTestCases \ + CtsWidgetTestCases \ SignatureTest DEFAULT_TEST_PLAN := $(PRIVATE_DIR)/resource/plans @@ -84,11 +93,12 @@ $(INTERNAL_CTS_TARGET): $(cts_dir)/all_cts_files_stamp $(DEFAULT_TEST_PLAN) @echo "Package CTS: $@" $(hide) cd $(dir $@) && zip -rq $(notdir $@) $(PRIVATE_NAME) -.PHONY: cts +.PHONY: cts cts: $(INTERNAL_CTS_TARGET) adb $(call dist-for-goals,cts,$(INTERNAL_CTS_TARGET)) define copy-testcase-apk + $(hide) $(ACP) -fp $(call intermediates-dir-for,APPS,$(1))/package.apk \ $(PRIVATE_DIR)/repository/testcases/$(1).apk diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 7a3c68232e..e38a80366a 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -71,3 +71,14 @@ ifeq "" "$(BUILD_NUMBER)" # anyone trying to parse it as an integer will probably get "0". BUILD_NUMBER := eng.$(USER).$(shell date +%Y%m%d.%H%M%S) endif + +ifeq "true" "$(DISPLAY_BUILD_NUMBER)" + # if the build_id.mk has this defined, then BUILD_ID is updated with + # the BUILD_NUMBER as well. For development branches, this will be + # set, but release branches this will not be set. + BUILD_DISPLAY_ID := "$(BUILD_ID).$(BUILD_NUMBER)" +else + BUILD_DISPLAY_ID := "$(BUILD_ID)" +endif + + diff --git a/envsetup.sh b/envsetup.sh index e20d68413d..016c399ba4 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -8,6 +8,7 @@ Invoke ". build/envsetup.sh" from your shell to add the following functions to y - cgrep: Greps on all local C/C++ files. - jgrep: Greps on all local Java files. - resgrep: Greps on all local res/*.xml files. +- godir: Go to the directory containing a file. Look at the source to view more functions. The complete list is: EOF @@ -644,7 +645,9 @@ function mmm() local MAKEFILE= local ARGS= local DIR TO_CHOP - for DIR in $@ ; do + local DASH_ARGS=$(echo "$@" | awk -v RS=" " -v ORS=" " '/^-.*$/') + local DIRS=$(echo "$@" | awk -v RS=" " -v ORS=" " '/^[^-].*$/') + for DIR in $DIRS ; do DIR=`echo $DIR | sed -e 's:/$::'` if [ -f $DIR/Android.mk ]; then TO_CHOP=`echo $T | wc -c | tr -d ' '` @@ -666,7 +669,7 @@ function mmm() fi fi done - ONE_SHOT_MAKEFILE="$MAKEFILE" make -C $T files $ARGS + ONE_SHOT_MAKEFILE="$MAKEFILE" make -C $T $DASH_ARGS files $ARGS else echo "Couldn't locate the top of the tree. Try setting TOP." fi @@ -881,39 +884,26 @@ function runhat() adb ${adbOptions} shell >/dev/null mkdir /data/misc adb ${adbOptions} shell chmod 777 /data/misc + # send a SIGUSR1 to cause the hprof dump echo "Poking $targetPid and waiting for data..." adb ${adbOptions} shell kill -10 $targetPid - echo "Press enter when logcat shows \"GC freed ## objects / ## bytes\"" + echo "Press enter when logcat shows \"hprof: heap dump completed\"" echo -n "> " read local availFiles=( $(adb ${adbOptions} shell ls /data/misc | grep '^heap-dump' | sed -e 's/.*heap-dump-/heap-dump-/' | sort -r | tr '[:space:][:cntrl:]' ' ') ) - local devHeadFile=/data/misc/${availFiles[0]} - local devTailFile=/data/misc/${availFiles[1]} + local devFile=/data/misc/${availFiles[0]} + local localFile=/tmp/$$-hprof - local localHeadFile=/tmp/$$-hprof-head - local localTailFile=/tmp/$$-hprof-tail + echo "Retrieving file $devFile..." + adb ${adbOptions} pull $devFile $localFile - echo "Retrieving file $devHeadFile..." - adb ${adbOptions} pull $devHeadFile $localHeadFile - echo "Retrieving file $devTailFile..." - adb ${adbOptions} pull $devTailFile $localTailFile + adb ${adbOptions} shell rm $devFile - local combinedFile=$outputFile - if [ "$combinedFile" = "" ]; then - combinedFile=/tmp/$$.hprof - fi - - cat $localHeadFile $localTailFile >$combinedFile - adb ${adbOptions} shell rm $devHeadFile - adb ${adbOptions} shell rm $devTailFile - rm $localHeadFile - rm $localTailFile - - echo "Running hat on $combinedFile" + echo "Running hat on $localFile" echo "View the output by pointing your browser at http://localhost:7000/" echo "" - hat $combinedFile + hat $localFile } function getbugreports() @@ -984,6 +974,50 @@ function runtest() (cd "$T" && development/tools/runtest $@) } +function godir () { + if [[ -z "$1" ]]; then + echo "Usage: godir " + return + fi + if [[ ! -f $T/filelist ]]; then + echo -n "Creating index..." + (cd $T; find . -wholename ./out -prune -o -type f > filelist) + echo " Done" + echo "" + fi + local lines + lines=($(grep "$1" $T/filelist | sed -e 's/\/[^/]*$//' | sort | uniq)) + if [[ ${#lines[@]} = 0 ]]; then + echo "Not found" + return + fi + local pathname + local choice + if [[ ${#lines[@]} > 1 ]]; then + while [[ -z "$pathname" ]]; do + local index=1 + local line + for line in ${lines[@]}; do + printf "%6s %s\n" "[$index]" $line + index=$(($index + 1)) + done + echo + echo -n "Select one: " + unset choice + read choice + if [[ $choice -gt ${#lines[@]} || $choice -lt 1 ]]; then + echo "Invalid choice" + continue + fi + pathname=${lines[$(($choice-$_arrayoffset))]} + done + else + # even though zsh arrays are 1-based, $foo[0] is an alias for $foo[1] + pathname=${lines[0]} + fi + cd $T/$pathname +} + # determine whether arrays are zero-based (bash) or one-based (zsh) _xarray=(a b c) if [ -z "${_xarray[${#_xarray[@]}]}" ] diff --git a/target/board/Android.mk b/target/board/Android.mk index 4d3496990e..64e3a7458c 100644 --- a/target/board/Android.mk +++ b/target/board/Android.mk @@ -26,7 +26,16 @@ else INSTALLED_RADIOIMAGE_TARGET := endif -include $(TARGET_DEVICE_DIR)/Android.mk +ifeq (,$(wildcard $(TARGET_DEVICE_DIR)/AndroidBoard.mk)) + ifeq (,$(wildcard $(TARGET_DEVICE_DIR)/Android.mk)) + $(error Missing "$(TARGET_DEVICE_DIR)/AndroidBoard.mk") + else + # TODO: Remove this check after people have had a chance to switch, + # after April 2009. + $(error Please rename "$(TARGET_DEVICE_DIR)/Android.mk" to "$(TARGET_DEVICE_DIR)/AndroidBoard.mk") + endif +endif +include $(TARGET_DEVICE_DIR)/AndroidBoard.mk # Generate a file that contains various information about the # device we're building for. This file is typically packaged up diff --git a/target/board/emulator/Android.mk b/target/board/emulator/AndroidBoard.mk similarity index 100% rename from target/board/emulator/Android.mk rename to target/board/emulator/AndroidBoard.mk diff --git a/target/board/generic/Android.mk b/target/board/generic/AndroidBoard.mk similarity index 100% rename from target/board/generic/Android.mk rename to target/board/generic/AndroidBoard.mk diff --git a/target/board/sim/Android.mk b/target/board/sim/AndroidBoard.mk similarity index 100% rename from target/board/sim/Android.mk rename to target/board/sim/AndroidBoard.mk diff --git a/target/product/min_dev.mk b/target/product/min_dev.mk index 34096a3bba..7d0fbe69b5 100644 --- a/target/product/min_dev.mk +++ b/target/product/min_dev.mk @@ -8,6 +8,7 @@ PRODUCT_DEVICE := generic PRODUCT_PACKAGES := \ DownloadProvider \ + GoogleSearch \ MediaProvider \ SettingsProvider \ PackageInstaller \ diff --git a/tools/apicheck/src/com/android/apicheck/ClassInfo.java b/tools/apicheck/src/com/android/apicheck/ClassInfo.java index 50f8a3c7e9..4bbf78b19a 100644 --- a/tools/apicheck/src/com/android/apicheck/ClassInfo.java +++ b/tools/apicheck/src/com/android/apicheck/ClassInfo.java @@ -122,8 +122,8 @@ public class ClassInfo { } for (String iface : mInterfaces) { if (!cl.mInterfaces.contains(iface)) { - Errors.error(Errors.REMOVED_INTERFACE, - cl.position(), "Removed interface " + iface); + Errors.error(Errors.REMOVED_INTERFACE, cl.position(), + "Class " + qualifiedName() + " no longer implements " + iface); } } for (String iface : cl.mInterfaces) { diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index 5069e4578d..4e99bf5c09 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -4,6 +4,7 @@ echo "# begin build properties" echo "# autogenerated by buildinfo.sh" echo "ro.build.id=$BUILD_ID" +echo "ro.build.display.id=$BUILD_DISPLAY_ID" echo "ro.build.version.incremental=$BUILD_NUMBER" echo "ro.build.version.sdk=$PLATFORM_SDK_VERSION" echo "ro.build.version.release=$PLATFORM_VERSION" diff --git a/tools/dexpreopt/Config.mk b/tools/dexpreopt/Config.mk index 58891fa8dc..c6639b28fc 100644 --- a/tools/dexpreopt/Config.mk +++ b/tools/dexpreopt/Config.mk @@ -29,12 +29,20 @@ LOCAL_PATH := $(my-dir) # would have different versions. intermediates := \ $(call intermediates-dir-for,PACKAGING,dexpreopt) -dexpreopt_initrc := $(LOCAL_PATH)/etc/init.rc dexpreopt_system_dir := $(intermediates)/system built_afar := $(call intermediates-dir-for,EXECUTABLES,afar)/afar built_dowrapper := \ $(call intermediates-dir-for,EXECUTABLES,dexopt-wrapper)/dexopt-wrapper +# Generate a stripped-down init.rc based on the real one. +dexpreopt_initrc := $(intermediates)/etc/init.rc +geninitrc_script := $(LOCAL_PATH)/geninitrc.awk +$(dexpreopt_initrc): script := $(geninitrc_script) +$(dexpreopt_initrc): system/core/rootdir/init.rc $(geninitrc_script) + @echo "Dexpreopt init.rc: $@" + @mkdir -p $(dir $@) + $(hide) awk -f $(script) < $< > $@ + BUILT_DEXPREOPT_RAMDISK := $(intermediates)/ramdisk.img $(BUILT_DEXPREOPT_RAMDISK): intermediates := $(intermediates) $(BUILT_DEXPREOPT_RAMDISK): dexpreopt_root_out := $(intermediates)/root diff --git a/tools/dexpreopt/dexopt-wrapper/Android.mk b/tools/dexpreopt/dexopt-wrapper/Android.mk index f2061694f1..e6ca389c6a 100644 --- a/tools/dexpreopt/dexopt-wrapper/Android.mk +++ b/tools/dexpreopt/dexopt-wrapper/Android.mk @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # + LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -25,6 +26,9 @@ LOCAL_C_INCLUDES += \ LOCAL_STATIC_LIBRARIES := \ libdex +LOCAL_SHARED_LIBRARIES := \ + libcutils + LOCAL_MODULE := dexopt-wrapper LOCAL_MODULE_TAGS := tests diff --git a/tools/dexpreopt/dexopt-wrapper/DexOptWrapper.cpp b/tools/dexpreopt/dexopt-wrapper/DexOptWrapper.cpp index 358f0ca15a..fde2d0861d 100644 --- a/tools/dexpreopt/dexopt-wrapper/DexOptWrapper.cpp +++ b/tools/dexpreopt/dexopt-wrapper/DexOptWrapper.cpp @@ -14,6 +14,8 @@ #include #include +#include "cutils/properties.h" + //using namespace android; /* @@ -36,9 +38,13 @@ static void runDexopt(int zipFd, int odexFd, const char* inputFileName) static const int kMaxIntLen = 12; // '-'+10dig+'\0' -OR- 0x+8dig char zipNum[kMaxIntLen]; char odexNum[kMaxIntLen]; + char dexoptFlags[PROPERTY_VALUE_MAX]; const char* androidRoot; char* execFile; + /* pull optional configuration tweaks out of properties */ + property_get("dalvik.vm.dexopt-flags", dexoptFlags, ""); + /* find dexopt executable; this exists for simulator compatibility */ androidRoot = getenv("ANDROID_ROOT"); if (androidRoot == NULL) @@ -50,7 +56,7 @@ static void runDexopt(int zipFd, int odexFd, const char* inputFileName) sprintf(odexNum, "%d", odexFd); execl(execFile, execFile, "--zip", zipNum, odexNum, inputFileName, - (char*) NULL); + dexoptFlags, (char*) NULL); fprintf(stderr, "execl(%s) failed: %s\n", kDexOptBin, strerror(errno)); } diff --git a/tools/dexpreopt/etc/init.rc b/tools/dexpreopt/etc/init.rc deleted file mode 100644 index e39f1fe1eb..0000000000 --- a/tools/dexpreopt/etc/init.rc +++ /dev/null @@ -1,167 +0,0 @@ - -on init - -loglevel 3 - -# setup the global environment - export PATH /sbin:/system/sbin:/system/bin:/system/xbin - export LD_LIBRARY_PATH /system/lib - export ANDROID_BOOTLOGO 1 - export ANDROID_ROOT /system - export ANDROID_ASSETS /system/app - export ANDROID_DATA /data - export EXTERNAL_STORAGE /sdcard - export BOOTCLASSPATH /system/framework/core.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar - -# Backward compatibility - symlink /system/etc /etc - -# create mountpoints and mount tmpfs on sqlite_stmt_journals and debugfs on d - mkdir /d - mkdir /sdcard 0000 system system - mkdir /system - mkdir /data 0771 system system - mkdir /cache 0770 system cache - mkdir /sqlite_stmt_journals 01777 root root - mount tmpfs tmpfs /sqlite_stmt_journals - mount debugfs debugfs /d - - mount rootfs rootfs / ro remount - - write /proc/sys/kernel/panic_on_oops 1 - write /proc/sys/kernel/hung_task_timeout_secs 0 - write /proc/cpu/alignment 4 - write /proc/sys/kernel/sched_latency_ns 10000000 - write /proc/sys/kernel/sched_wakeup_granularity_ns 2000000 - -# mount mtd partitions - # Mount /system rw first to give the filesystem a chance to save a checkpoint - mount yaffs2 mtd@system /system - # dexpreopt needs to write to /system - ### mount yaffs2 mtd@system /system ro remount - - # We chown/chmod /data again so because mount is run as root + defaults - mount yaffs2 mtd@userdata /data - chown system system /data - chmod 0771 /data - - # Same reason as /data above - mount yaffs2 mtd@cache /cache - chown system cache /cache - chmod 0770 /cache - - # This may have been created by the recovery system with odd permissions - chown system system /cache/recovery - chmod 0770 /cache/recovery - -# create basic filesystem structure - mkdir /data/dalvik-cache 0777 root root - mkdir /data/misc 01771 system misc - mkdir /data/misc/hcid 0770 bluetooth bluetooth - mkdir /data/local 0771 shell shell - mkdir /data/local/tmp 0771 shell shell - mkdir /data/data 0771 system system - mkdir /data/app-private 0771 system system - mkdir /data/app 0771 system system - mkdir /data/property 0700 root root - - # create dalvik-cache and double-check the perms - mkdir /data/dalvik-cache 0771 system system - chown system system /data/dalvik-cache - chmod 0771 /data/dalvik-cache - - # create the lost+found directories, so as to enforce our permissions - mkdir /data/lost+found 0770 - mkdir /cache/lost+found 0770 - - # double check the perms, in case lost+found already exists, and set owner - chown root root /data/lost+found - chmod 0770 /data/lost+found - chown root root /cache/lost+found - chmod 0770 /cache/lost+found - -on boot -# basic network init - ifup lo - hostname localhost - domainname localdomain - -# set RLIMIT_NICE to allow priorities from 19 to -20 - setrlimit 13 40 40 - -# Define the oom_adj values for the classes of processes that can be -# killed by the kernel. These are used in ActivityManagerService. - setprop ro.FOREGROUND_APP_ADJ 0 - setprop ro.VISIBLE_APP_ADJ 1 - setprop ro.SECONDARY_SERVER_ADJ 2 - setprop ro.HIDDEN_APP_MIN_ADJ 7 - setprop ro.CONTENT_PROVIDER_ADJ 14 - setprop ro.EMPTY_APP_ADJ 15 - -# Define the memory thresholds at which the above process classes will -# be killed. These numbers are in pages (4k). - setprop ro.FOREGROUND_APP_MEM 1536 - setprop ro.VISIBLE_APP_MEM 2048 - setprop ro.SECONDARY_SERVER_MEM 4096 - setprop ro.HIDDEN_APP_MEM 5120 - setprop ro.CONTENT_PROVIDER_MEM 5632 - setprop ro.EMPTY_APP_MEM 6144 - -# Write value must be consistent with the above properties. - write /sys/module/lowmemorykiller/parameters/adj 0,1,2,7,14,15 - - write /proc/sys/vm/overcommit_memory 1 - write /sys/module/lowmemorykiller/parameters/minfree 1536,2048,4096,5120,5632,6144 - - class_start default - - # Set init its forked children's oom_adj. - write /proc/1/oom_adj -16 - - # Permissions for System Server and daemons. - chown radio system /sys/android_power/state - chown radio system /sys/android_power/request_state - chown radio system /sys/android_power/acquire_full_wake_lock - chown radio system /sys/android_power/acquire_partial_wake_lock - chown radio system /sys/android_power/release_wake_lock - chown system system /sys/class/timed_output/vibrator/enable - chown system system /sys/class/leds/keyboard-backlight/brightness - chown system system /sys/class/leds/lcd-backlight/brightness - chown system system /sys/class/leds/button-backlight/brightness - chown system system /sys/class/leds/red/brightness - chown system system /sys/class/leds/green/brightness - chown system system /sys/class/leds/blue/brightness - chown system system /sys/class/leds/red/device/grpfreq - chown system system /sys/class/leds/red/device/grppwm - chown system system /sys/class/leds/red/device/blink - chown system system /sys/class/leds/red/brightness - chown system system /sys/class/leds/green/brightness - chown system system /sys/class/leds/blue/brightness - chown system system /sys/class/leds/red/device/grpfreq - chown system system /sys/class/leds/red/device/grppwm - chown system system /sys/class/leds/red/device/blink - chown system system /sys/class/timed_output/vibrator/enable - chown bluetooth bluetooth /sys/module/board_trout/parameters/bluetooth_power_on - chown system system /sys/module/sco/parameters/disable_esco - chmod 0660 /sys/module/board_trout/parameters/bluetooth_power_on - chown system system /sys/kernel/ipv4/tcp_wmem_min - chown system system /sys/kernel/ipv4/tcp_wmem_def - chown system system /sys/kernel/ipv4/tcp_wmem_max - chown system system /sys/kernel/ipv4/tcp_rmem_min - chown system system /sys/kernel/ipv4/tcp_rmem_def - chown system system /sys/kernel/ipv4/tcp_rmem_max - chown root radio /proc/cmdline - -# Define TCP buffer sizes for various networks -# ReadMin, ReadInitial, ReadMax, WriteMin, WriteInitial, WriteMax, - setprop net.tcp.buffersize.default 4096,87380,110208,4096,16384,110208 - setprop net.tcp.buffersize.wifi 4095,87380,110208,4096,16384,110208 - setprop net.tcp.buffersize.umts 4094,87380,110208,4096,16384,110208 - setprop net.tcp.buffersize.edge 4093,26280,35040,4096,16384,35040 - setprop net.tcp.buffersize.gprs 4092,8760,11680,4096,8760,11680 - - -## Daemon processes to be run by init. -## -service console /system/bin/sh - console diff --git a/tools/dexpreopt/geninitrc.awk b/tools/dexpreopt/geninitrc.awk new file mode 100644 index 0000000000..4b67e78e0b --- /dev/null +++ b/tools/dexpreopt/geninitrc.awk @@ -0,0 +1,62 @@ +# +# Copyright (C) 2009 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +BEGIN { + fixed_remount = 0; + console_state = 0; +} + +/^ mount yaffs2 mtd@system \/system ro remount$/ { + fixed_remount = 1; + print " # dexpreopt needs to write to /system"; + print " ### " $0; + next; +} + +console_state == 0 && /^service console \/system\/bin\/sh$/ { + console_state = 1; + print; + next; +} + +console_state == 1 && /^ console$/ { + console_state = 2; + print; + exit; +} + +console_state == 1 { + # The second line of the console entry should always immediately + # follow the first. + exit; +} + +{ print } + +END { + failed = 0; + if (fixed_remount != 1) { + print "ERROR: no match for remount line" > "/dev/stderr"; + failed = 1; + } + if (console_state != 2) { + print "ERROR: no match for console lines" > "/dev/stderr"; + failed = 1; + } + if (failed == 1) { + print ">>>> FAILED <<<<" + exit 1; + } +} diff --git a/tools/droiddoc/src/DroidDoc.java b/tools/droiddoc/src/DroidDoc.java index 23ff6543cc..f664c416df 100644 --- a/tools/droiddoc/src/DroidDoc.java +++ b/tools/droiddoc/src/DroidDoc.java @@ -461,10 +461,13 @@ public class DroidDoc continue; } Boolean allHidden = true; - int pass = 1; - ClassInfo[] classesToCheck = pkg.ordinaryClasses(); + int pass = 0; + ClassInfo[] classesToCheck = null; while (pass < 5 ) { switch(pass) { + case 0: + classesToCheck = pkg.ordinaryClasses(); + break; case 1: classesToCheck = pkg.enums(); break; diff --git a/tools/droiddoc/src/Errors.java b/tools/droiddoc/src/Errors.java index 143131446f..dfeac8867c 100644 --- a/tools/droiddoc/src/Errors.java +++ b/tools/droiddoc/src/Errors.java @@ -25,10 +25,12 @@ public class Errors private static class Message implements Comparable { SourcePositionInfo pos; + int level; String msg; - Message(SourcePositionInfo p, String m) { + Message(SourcePositionInfo p, int l, String m) { pos = p; + level = l; msg = m; } @@ -50,14 +52,15 @@ public class Errors return; } - String which = (!warningsAreErrors && error.level == WARNING) ? " warning " : " error "; + int level = (!warningsAreErrors && error.level == WARNING) ? WARNING : ERROR; + String which = level == WARNING ? " warning " : " error "; String message = which + error.code + ": " + text; if (where == null) { where = new SourcePositionInfo("unknown", 0, 0); } - allErrors.add(new Message(where, message)); + allErrors.add(new Message(where, level, message)); if (error.level == ERROR || (warningsAreErrors && error.level == WARNING)) { hadError = true; @@ -66,7 +69,14 @@ public class Errors public static void printErrors() { for (Message m: allErrors) { - System.err.println(m.toString()); + if (m.level == WARNING) { + System.err.println(m.toString()); + } + } + for (Message m: allErrors) { + if (m.level == ERROR) { + System.err.println(m.toString()); + } } } diff --git a/tools/droiddoc/src/PackageInfo.java b/tools/droiddoc/src/PackageInfo.java index 09b73d4886..aac0defbde 100644 --- a/tools/droiddoc/src/PackageInfo.java +++ b/tools/droiddoc/src/PackageInfo.java @@ -117,36 +117,55 @@ public class PackageInfo extends DocInfo implements ContainerInfo public void makeClassLinkListHDF(HDF data, String base) { makeLink(data, base); - ClassInfo.makeLinkListHDF(data, base + ".interfaces", ClassInfo.sortByName(interfaces())); - ClassInfo.makeLinkListHDF(data, base + ".classes", ClassInfo.sortByName(ordinaryClasses())); - ClassInfo.makeLinkListHDF(data, base + ".enums", ClassInfo.sortByName(enums())); - ClassInfo.makeLinkListHDF(data, base + ".exceptions", ClassInfo.sortByName(exceptions())); - ClassInfo.makeLinkListHDF(data, base + ".errors", ClassInfo.sortByName(errors())); + ClassInfo.makeLinkListHDF(data, base + ".interfaces", interfaces()); + ClassInfo.makeLinkListHDF(data, base + ".classes", ordinaryClasses()); + ClassInfo.makeLinkListHDF(data, base + ".enums", enums()); + ClassInfo.makeLinkListHDF(data, base + ".exceptions", exceptions()); + ClassInfo.makeLinkListHDF(data, base + ".errors", errors()); } public ClassInfo[] interfaces() { - return filterHidden(Converter.convertClasses(mPackage.interfaces())); + if (mInterfaces == null) { + mInterfaces = ClassInfo.sortByName(filterHidden(Converter.convertClasses( + mPackage.interfaces()))); + } + return mInterfaces; } public ClassInfo[] ordinaryClasses() { - return filterHidden(Converter.convertClasses(mPackage.ordinaryClasses())); + if (mOrdinaryClasses == null) { + mOrdinaryClasses = ClassInfo.sortByName(filterHidden(Converter.convertClasses( + mPackage.ordinaryClasses()))); + } + return mOrdinaryClasses; } public ClassInfo[] enums() { - return filterHidden(Converter.convertClasses(mPackage.enums())); + if (mEnums == null) { + mEnums = ClassInfo.sortByName(filterHidden(Converter.convertClasses(mPackage.enums()))); + } + return mEnums; } public ClassInfo[] exceptions() { - return filterHidden(Converter.convertClasses(mPackage.exceptions())); + if (mExceptions == null) { + mExceptions = ClassInfo.sortByName(filterHidden(Converter.convertClasses( + mPackage.exceptions()))); + } + return mExceptions; } public ClassInfo[] errors() { - return filterHidden(Converter.convertClasses(mPackage.errors())); + if (mErrors == null) { + mErrors = ClassInfo.sortByName(filterHidden(Converter.convertClasses( + mPackage.errors()))); + } + return mErrors; } // in hashed containers, treat the name as the key @@ -157,5 +176,10 @@ public class PackageInfo extends DocInfo implements ContainerInfo private String mName; private PackageDoc mPackage; + private ClassInfo[] mInterfaces; + private ClassInfo[] mOrdinaryClasses; + private ClassInfo[] mEnums; + private ClassInfo[] mExceptions; + private ClassInfo[] mErrors; } diff --git a/tools/droiddoc/templates-sdk/customization.cs b/tools/droiddoc/templates-sdk/customization.cs index 6a0f64c359..a116c6714c 100644 --- a/tools/droiddoc/templates-sdk/customization.cs +++ b/tools/droiddoc/templates-sdk/customization.cs @@ -5,14 +5,8 @@ -
-
+
+
@@ -82,9 +90,26 @@ - -Copyright 2008 The Android Open Source Project +Except as noted, this content is +licensed under +Creative Commons Attribution 2.5. For details and +restrictions, see the Content +License. + +Except as noted, this content is +licensed under Apache 2.0. +For details and restrictions, see the +Content License. + + +

+ Site Terms of Service - + Privacy Policy - + Brand Guidelines +

+ -Build - +Android 1.1 r1 - diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs index e274237ec3..97fab66a01 100644 --- a/tools/droiddoc/templates-sdk/sdkpage.cs +++ b/tools/droiddoc/templates-sdk/sdkpage.cs @@ -1,88 +1,94 @@ + - + + + Redirecting... + + + + + + - +
-
+
-

-

- - -Release Notes -

+ + Redirecting to + + sdk//index.html + ... + + +

+

+ +

-
-
-

Get Started

-

System and Sofware Requirements

-

Guide to Installing the SDK

- -

Upgrade

-

Upgrading the SDK

-

API changes overview

-

API differences report

- -

Using Eclipse?

-

Android provides an Eclipse plugin to help make programming and debugging easier.

-

Install Eclipse plugin

-
-
- - -

Before downloading, please read the Terms - that govorn the use of the Android SDK.

- -

Please note: The Android SDK is under active development. - Please keep this in mind as you explore its capabilities. If you discover any issues, we - welcome you to notify us of them via our Issue Tracker.

- - + +
+

This is NOT the latest version of the Android SDK.

+

Go to the SDK home page to be directed to the latest version.

+
+ + + +

Before downloading, please read the +System Requirements document. As you start the download, you will also need to review and agree to +the Terms and Conditions that govern the use of the Android SDK.

+ +
+ + + + + + - - - - - - - - - - - - - - - - - - - - - - - -
PlatformPackageSizeMD5 Checksum
PlatformPackageSizeMD5 Checksum
Windows - -
Mac OS X (intel) - -
Linux (i386) - -
+ Windows + + + + bytes + + + + Mac OS X (intel) + + + + bytes + + + + Linux (i386) + + + + bytes + + + + + +
-
- + + + diff --git a/tools/droiddoc/templates/assets/android-developer-core.css b/tools/droiddoc/templates/assets/android-developer-core.css index 73c08db11b..b32f129ec3 100644 --- a/tools/droiddoc/templates/assets/android-developer-core.css +++ b/tools/droiddoc/templates/assets/android-developer-core.css @@ -18,22 +18,25 @@ embed,object,applet { /* BASICS */ +html, body { + overflow:hidden; /* keeps scrollbar off IE */ + background-color:#fff; +} + body { font-family:arial,sans-serif; color:#000; font-size:13px; color:#333; - overflow:hidden; - padding:0; - margin:0; background-image:url(images/bg_fade.jpg); background-repeat:repeat-x; } a, a code { - color:#00c; + color:#006699; } + a:active, a:active code { color:#f00; @@ -41,7 +44,7 @@ a:active code { a:visited, a:visited code { - color:#551a8b; + color:#006699; } input, select, @@ -164,75 +167,68 @@ hr.blue { /* LAYOUT */ #body-content { margin:0; - position:fixed; - top:103px; + position:relative; width:100%; } #header { - border-bottom: #74AC23 solid 3px; - height: 100px; + height: 114px; position:relative; z-index:100; - min-width:620px; + min-width:576px; + padding:0 10px; + border-bottom:3px solid #94b922; } #headerLeft{ - position:absolute; - border:none; - margin:20px 0 0 10px; - overflow:visible; - font-size: 36px; + padding: 25px 0 0; } #headerRight { - float:right; - border:none; - width:615px; - height:100px; + position:absolute; + right:0; + top:0; + text-align:right; } /* Tabs in the header */ #header ul { list-style: none; - float: right; - margin: 0px 3px 0px 0px; - padding: 0px 0px 0px 0px; - height: 32px; - position:absolute; - bottom:0; - right:0; + margin: 7px 0 0; + padding: 0; + height: 29px; } #header li { float: left; - margin: 0px 5px 0px 0px; + margin: 0px 2px 0px 0px; padding:0; } #header li a { text-decoration: none; display: block; - background-image: url(images/tab_default.png); + background-image: url(images/bg_images_sprite.png); + background-position: 0 -58px; background-repeat: no-repeat; color: #666; font-size: 13px; - font-weight: normal; - width: 96px; - height: 32px; + font-weight: bold; + width: 94px; + height: 29px; text-align: center; margin: 0px; } #header li a:hover { - background-image: url(images/tab_hover.png); + background-image: url(images/bg_images_sprite.png); + background-position: 0 -29px; background-repeat: no-repeat; - color: #fff; } #header li a span { position:relative; - top:9px; + top:7px; } /* TAB HIGHLIGHTING */ @@ -243,7 +239,8 @@ hr.blue { .sdk #sdk-link a, .community #community-link a, .about #about-link a { - background-image: url(images/tab_selected.png); + background-image: url(images/bg_images_sprite.png); + background-position: 0 0; background-repeat: no-repeat; color: #fff; font-weight: bold; @@ -257,14 +254,13 @@ hr.blue { .sdk #sdk-link a:hover, .community #community-link a:hover, .about #about-link a:hover { - background-image: url(images/tab_selected.png); + background-image: url(images/bg_images_sprite.png); + background-position: 0 0; } #headerLinks { margin:10px 10px 0 0; height:13px; - /* nudge IE because green border is inside header */ - _margin-top:7px; } #headerLinks .text { @@ -283,7 +279,7 @@ hr.blue { #search { height:45px; - margin:0 10px 0 0; + margin:15px 10px 0 0; } /* main */ @@ -296,7 +292,7 @@ hr.blue { #mainBodyFixed { margin: 20px 10px; color: #333; - width:920px; + width:930px; } #mainBodyFixed h3, @@ -329,13 +325,6 @@ hr.blue { background-color:none; } -#mainBodyFixed a, -#mainBodyFluid a { - color: #006699; - font-size: 13px; - text-decoration: underline; -} - #mainBodyLeft { float: left; width: 600px; @@ -383,17 +372,17 @@ div.indent { #mainBodyRight td { border:0px solid #666; - padding:0px 5px; - text-align:left; + padding:0px 5px; + text-align:left; } #mainBodyRight .blueBorderBox { border:5px solid #ddf0f2; - padding:18px 18px 18px 18px; - text-align:left; + padding:18px 18px 18px 18px; + text-align:left; } -#mainBodyRight .seperator { +#mainBodyFixed .seperator { background-image:url(images/hr_gray_side.jpg); background-repeat:no-repeat; width: 100%; @@ -421,17 +410,27 @@ div.indent { float: left; width:90%; margin: 20px; - color: #666; + color: #aaa; font-size: 11px; } #footer a { - color: #666; + color: #aaa; font-size: 11px; } #footer a:hover { text-decoration: underline; + color:#aaa; +} + +#footerlinks { + margin-top:2px; +} + +#footerlinks a, +#footerlinks a:visited { + color:#006699; } #homeBottom td { @@ -537,16 +536,13 @@ vertical-align: bottom; #search_filtered_div { position:absolute; + margin-top:-1px; z-index:101; - width:280px; + border:1px solid #BCCDF0; + background-color:#fff; } #search_filtered { - border:1px solid #BCCDF0; - background-color:#fff; - position:relative; - top:-1px; - _top:-19px; /*IE*/ min-width:100%; } #search_filtered td{ @@ -554,11 +550,9 @@ vertical-align: bottom; border-bottom: 1px solid #669999; line-height:1.5em; } -#search_filtered a{ - color:#0000cc; -} + #search_filtered .jd-selected { - background-color: #A4C639; + background-color: #94b922; cursor:pointer; } #search_filtered .jd-selected, @@ -692,44 +686,71 @@ td.gsc-search-button { padding: 0px 0px 0px 0px; float: left; width: 584px; - height: 450px; + height: 580px; background:url(images/home/bg_home_middle.png) no-repeat 0 0; } -#homeMiddle #homeTitle { - margin:17px 17px 0; - height:35px; +#homeTitle { + margin:15px 15px 0; + height:30px; + background:url(images/hr_gray_side.jpg) no-repeat 0 29px; +} + +#homeTitle h2 { + padding:0; +} + +#announcement-block { + margin:15px 15px 0; + height:125px; +} + +#announcement-block img { + float:left; + margin:0 30px 0 0; +} + +#announcement { + float:left; + margin:0; } .clearer { clear:both; } #arrow-left, #arrow-right { display:block; - width:25px; - height:116px; + width:42px; + height:42px; + background-image:url(images/home/carousel_buttons_sprite.png); background-repeat:no-repeat; } #arrow-left { float:left; - margin:0 15px 0 10px; + margin:35px 3px 0 10px; } #arrow-right { float:left; - margin-left:15px; + margin:35px 10px 0 0; } .arrow-left-off, +#arrow-left.arrow-left-off:hover { + background-position:0 0; +} +.arrow-right-off, +#arrow-right.arrow-right-off:hover { + background-position:-42px 0; +} #arrow-left:hover { - background-image:url(images/arrow_left_off.jpg); + background-position:0 -42px; +} +#arrow-right:hover { + background-position:-42px -42px; } .arrow-left-on { - background-image:url(images/arrow_left_on.jpg); -} -.arrow-right-off, -#arrow-right:hover { - background-image:url(images/arrow_right_off.jpg); + background-position:0 0; } .arrow-right-on { - background-image:url(images/arrow_right_on.jpg); + background-position:-42px 0; } .arrow-right-off, @@ -740,7 +761,7 @@ td.gsc-search-button { .app-list-container { clear:both; text-align: center; - margin:37px 25px 0; + margin:37px 20px 0; _margin-top:33px; border:0px solid #ccc; position:relative; @@ -761,7 +782,7 @@ div#app-list { position:absolute; margin:11px 0 0; _margin-top:13px; - width:100%; + width:1000%; } #app-list a { @@ -794,9 +815,14 @@ div#app-list { cursor:default; text-decoration:none; } + #app-list a:hover, #app-list a:active { background:#ff9900; +} + +#app-list a:hover span, +#app-list a:active span { text-decoration:underline; } diff --git a/tools/droiddoc/templates/assets/android-developer-docs.css b/tools/droiddoc/templates/assets/android-developer-docs.css index 44b5a4d616..27ef359ae6 100644 --- a/tools/droiddoc/templates/assets/android-developer-docs.css +++ b/tools/droiddoc/templates/assets/android-developer-docs.css @@ -34,6 +34,10 @@ font-size:12px; } +#side-nav.not-resizable { + background:url('images/sidenav-rule.png') no-repeat 243px 0; +} + #resize-packages-nav { /* keeps the resize handle below the h-scroll handle */ height:270px; @@ -199,6 +203,17 @@ overflow-y: scroll; } +#nav-swap { + font-size:10px; + line-height:10px; + margin-left:1em; + text-decoration:none; + display:block; +} + +#tree-link { + +} /* DOCUMENT BODY */ @@ -208,7 +223,7 @@ #jd-header { background-color: #E2E2E2; - padding: 7px 20px; + padding: 7px 15px; } #jd-header h1 { @@ -268,10 +283,12 @@ font-size:.9em; text-decoration:underline; } -/* a div inside a sumtable th holding "Expand All" */ -.expandall { -float:right; -font-weight:normal; +/* the link inside a sumtable for "Show All/Hide All" */ +.toggle-all { + display:block; + float:right; + font-weight:normal; + font-size:0.9em; } /* adjustments for in/direct subclasses tables */ @@ -354,7 +371,7 @@ links to summary tables) */ } #jd-content { - padding: 18px 20px; + padding: 18px 15px; } hr { @@ -640,22 +657,18 @@ pre.classic { #qv-wrapper { float: right; - position:relative; - width:315px; + width:310px; background-color:#fff; - padding:4px 30px 15px 20px; - top:-55px; - left:20px; + margin:-48px 0 0 0; + padding:0 0 20px 35px; } #qv { background-color:#fff; border:4px solid #dee8f1; - margin:0 0 0 15px; + margin:0; padding:0 6px 6px; - margin-top:0px; - width:295; - float:right; + width:270px; font-size:.9em; } @@ -730,27 +743,50 @@ pre.classic { .sidebox-wrapper { float: right; - width:300px; + width:280px; background-color:#fff; - margin: 0 0 0 15px; - padding: 5px 0 5px 15px; + margin: 0; + padding: 20px 0 20px 20px; } .sidebox-inner { border-left:1px solid #dee8f1; background-color:#ffffee; - padding:0 5px 0 15px; + padding:5px 8px 5px 12px; + font-size:90%; + width:260px; } .sidebox { float: right; - width:285px; + width:260px; background-color:#ffffee; border-left:1px solid #dee8f1; - margin: 0 0 0 15px; + margin: 12px 0 0 15px; padding:5px 8px 0 12px; + font-size:90%; } +.sidebox p, +.sidebox-inner p { + margin-bottom: .25em; +} + +.sidebox ul, +.sidebox-inner ul { + padding: 0 0 0 1.5em; +} + +.sidebox li ul, +.sidebox-inner li ul { + margin-top:0; + margin-bottom:.1em; +} + +.sidebox li, +.sidebox-inner li { +padding:0 0 0 0em; +} #jd-content .sidebox h2, #jd-content .sidebox h3, @@ -857,7 +893,7 @@ tr.alt-color { } /* expando trigger */ -#jd-content .jd-expando-trigger { +#jd-content .jd-expando-trigger-img { margin:0; } @@ -1042,4 +1078,4 @@ body .ui-resizable-autohide .ui-resizable-handle { display: none; } /* use 'body display:none; } -} \ No newline at end of file +} diff --git a/tools/droiddoc/templates/assets/android-developer-docs.js b/tools/droiddoc/templates/assets/android-developer-docs.js index f2276ee992..cd9c0b3619 100644 --- a/tools/droiddoc/templates/assets/android-developer-docs.js +++ b/tools/droiddoc/templates/assets/android-developer-docs.js @@ -3,7 +3,7 @@ var classesNav; var devdocNav; var sidenav; var content; -var HEADER_HEIGHT = 103; +var HEADER_HEIGHT = 117; var cookie_style = 'android_developer'; var NAV_PREF_TREE = "tree"; var NAV_PREF_PANELS = "panels"; @@ -23,16 +23,17 @@ function addLoadEvent(newfun) { } } -addLoadEvent(prepare); window.onresize = resizeAll; function setToRoot(root) { toRoot = root; + // note: toRoot also used by carousel.js } function restoreWidth(navWidth) { var windowWidth = $(window).width() + "px"; - content.css({marginLeft:navWidth, width:parseInt(windowWidth) - parseInt(navWidth) + "px"}); + content.css({marginLeft:parseInt(navWidth) + 6 + "px", //account for 6px-wide handle-bar + width:parseInt(windowWidth) - parseInt(navWidth) - 6 + "px"}); sidenav.css({width:navWidth}); resizePackagesNav.css({width:navWidth}); classesNav.css({width:navWidth}); @@ -70,17 +71,21 @@ function getCookie(cookie) { } function writeCookie(cookie, val, path, expiration) { - if (!val) return; + if (!val) return; + var date = new Date(); + date.setTime(date.getTime()+(10*365*24*60*60*1000)); // default expiration is one week + expiration = expiration ? expiration : date.toGMTString(); if (location.href.indexOf("/reference/") != -1) { - document.cookie = cookie_style+'_reference_'+cookie+'='+ val+'; path=' + toRoot + path + - ((expiration) ? '; expires=' + expiration : ''); + document.cookie = cookie_style+'_reference_'+cookie+'='+val+'; expires='+expiration+'; path='+'/'+path; } else if (location.href.indexOf("/guide/") != -1) { - document.cookie = cookie_style+'_guide_'+cookie+'='+val+'; path=' + toRoot + path + - ((expiration) ? '; expires=' + expiration : ''); + document.cookie = cookie_style+'_guide_'+cookie+'='+val+'; expires='+expiration+'; path='+'/'+path; } } -function prepare() { +function init() { + $("#resize-packages-nav").resizable({handles: "s", resize: function(e, ui) { resizeHeight(); } }); + $(".side-nav-resizable").resizable({handles: "e", resize: function(e, ui) { resizeWidth(); } }); + $("#side-nav").css({position:"absolute",left:0}); content = $("#doc-content"); resizePackagesNav = $("#resize-packages-nav"); @@ -88,7 +93,6 @@ function prepare() { sidenav = $("#side-nav"); devdocNav = $("#devdoc-nav"); - if (location.href.indexOf("/reference/") != -1) { var cookiePath = "reference_"; } else if (location.href.indexOf("/guide/") != -1) { @@ -107,22 +111,30 @@ function prepare() { resizeHeight(); } - if (devdocNav.length) { + if (devdocNav.length) { // only dev guide and sdk highlightNav(location.href); } } function highlightNav(fullPageName) { var lastSlashPos = fullPageName.lastIndexOf("/"); - var firstSlashPos = fullPageName.indexOf("/",8); // first slash after http:// + var firstSlashPos = (fullPageName.indexOf("/guide/") != -1) ? + fullPageName.indexOf("/guide/") : + fullPageName.indexOf("/sdk/"); // first slash after /guide or /sdk if (lastSlashPos == (fullPageName.length - 1)) { // if the url ends in slash (add 'index.html') fullPageName = fullPageName + "index.html"; } var htmlPos = fullPageName.lastIndexOf(".html", fullPageName.length); var pathPageName = fullPageName.slice(firstSlashPos, htmlPos + 5); var link = $("#devdoc-nav a[href$='"+ pathPageName+"']"); - if (link.length == 0) { // if there's no match, then the nav url must be the parent dir (ie, this doc isn't listed, so highlight the parent - link = $("#devdoc-nav a[href$='"+ pathPageName.slice(0, pathPageName.lastIndexOf("/") + 1)+"']"); + if ((link.length == 0) && (fullPageName.indexOf("/guide/") != -1)) { // if there's no match, then let's backstep through the directory until we find an index.html page that matches our ancestor directories (only for dev guide) + lastBackstep = pathPageName.lastIndexOf("/"); + while (link.length == 0) { + backstepDirectory = pathPageName.lastIndexOf("/", lastBackstep); + link = $("#devdoc-nav a[href$='"+ pathPageName.slice(0, backstepDirectory + 1)+"index.html']"); + lastBackstep = pathPageName.lastIndexOf("/", lastBackstep - 1); + if (lastBackstep == 0) break; + } } link.parent().addClass('selected'); if (link.parent().parent().is(':hidden')) { @@ -143,26 +155,22 @@ function resizeHeight() { $("#packages-nav").css({height:parseInt(resizePackagesNav.css("height")) - 6 + "px"}); //move 6px for handle devdocNav.css({height:sidenav.css("height")}); $("#nav-tree").css({height:swapperHeight + "px"}); - writeCookie("height", resizePackagesNav.css("height"), "reference/", null); + writeCookie("height", resizePackagesNav.css("height"), "", null); } function resizeWidth() { - if (location.href.indexOf("/reference/") != -1) { - var path = "reference/"; - } else if (location.href.indexOf("/guide/") != -1) { - var path = "guide/"; - } var windowWidth = $(window).width() + "px"; if (sidenav.length) { var sidenavWidth = sidenav.css("width"); } else { var sidenavWidth = 0; } - content.css({marginLeft:sidenavWidth, width:parseInt(windowWidth) - parseInt(sidenavWidth) + "px"}); + content.css({marginLeft:parseInt(sidenavWidth) + 6 + "px", //account for 6px-wide handle-bar + width:parseInt(windowWidth) - parseInt(sidenavWidth) - 6 + "px"}); resizePackagesNav.css({width:sidenavWidth}); classesNav.css({width:sidenavWidth}); $("#packages-nav").css({width:sidenavWidth}); - writeCookie("width", sidenavWidth, path, null); + writeCookie("width", sidenavWidth, "", null); } function resizeAll() { @@ -171,6 +179,10 @@ function resizeAll() { } function loadLast(cookiePath) { + var location = window.location.href; + if (location.indexOf("/"+cookiePath+"/") != -1) { + return true; + } var lastPage = getCookie(cookiePath + "_lastpage"); if (lastPage) { window.location = lastPage; @@ -179,11 +191,6 @@ function loadLast(cookiePath) { return true; } -$(document).ready(function(){ - $("#resize-packages-nav").resizable({handles: "s", resize: function(e, ui) { resizeHeight(); } }); - $(".side-nav-resizable").resizable({handles: "e", resize: function(e, ui) { resizeWidth(); } }); -}); - $(window).unload(function(){ var href = location.href; if (href.indexOf("/reference/") != -1) { @@ -195,7 +202,6 @@ $(window).unload(function(){ - function toggle(obj, slide) { var ul = $("ul", obj); var li = ul.parent(); @@ -253,7 +259,7 @@ function swapNav() { } var date = new Date(); date.setTime(date.getTime()+(10*365*24*60*60*1000)); // keep this for 10 years - writeCookie("nav", nav_pref, "reference/", date.toGMTString()); + writeCookie("nav", nav_pref, "", date.toGMTString()); $("#nav-panels").toggle(); $("#panel-link").toggle(); @@ -272,14 +278,50 @@ function scrollIntoView(nav) { if (navObj.is(':visible')) { var selected = $(".selected", navObj); if (selected.length == 0) return; + if (selected.is("div")) selected = selected.parent(); var scrolling = document.getElementById(nav); var navHeight = navObj.height(); - var offset = selected.position(); - if(offset.top > navHeight - 92) { - scrolling.scrollTop = offset.top - navHeight + 92; + var offsetTop = selected.position().top; + if (selected.parent().parent().is(".toggle-list")) offsetTop += selected.parent().parent().position().top; + if(offsetTop > navHeight - 92) { + scrolling.scrollTop = offsetTop - navHeight + 92; } } } +function toggleAllInherited(linkObj, expand) { + var a = $(linkObj); + var table = $(a.parent().parent().parent()); + var expandos = $(".jd-expando-trigger", table); + if ( (expand == null && a.text() == "[Expand]") || expand ) { + expandos.each(function(i) { + toggleInherited(this, true); + }); + a.text("[Collapse]"); + } else if ( (expand == null && a.text() == "[Collapse]") || (expand == false) ) { + expandos.each(function(i) { + toggleInherited(this, false); + }); + a.text("[Expand]"); + } + return false; +} +function toggleAllSummaryInherited(linkObj) { + var a = $(linkObj); + var content = $(a.parent().parent().parent()); + var toggles = $(".toggle-all", content); + if (a.text() == "[Expand All]") { + toggles.each(function(i) { + toggleAllInherited(this, true); + }); + a.text("[Collapse All]"); + } else { + toggles.each(function(i) { + toggleAllInherited(this, false); + }); + a.text("[Expand All]"); + } + return false; +} diff --git a/tools/droiddoc/templates/assets/carousel.js b/tools/droiddoc/templates/assets/carousel.js index dee3130b09..09c19f9f5a 100644 --- a/tools/droiddoc/templates/assets/carousel.js +++ b/tools/droiddoc/templates/assets/carousel.js @@ -80,6 +80,7 @@ function buildCarousel() { var a = document.createElement("a"); var img = document.createElement("img"); var br = document.createElement("br"); + var span = document.createElement("span"); var text = document.createTextNode(droid.name); a.setAttribute("id", "droidlink-" + x); @@ -89,9 +90,10 @@ function buildCarousel() { img.setAttribute("src", assetsRoot + "images/home/" + droid.icon); img.setAttribute("alt", ""); + span.appendChild(text); a.appendChild(img); a.appendChild(br); - a.appendChild(text); + a.appendChild(span); appList.appendChild(a); } } @@ -111,7 +113,7 @@ var arrowLeft = 'arrow-left'; // the left control arrow function showPreview(slideName) { -// centerSlide(slideName); + centerSlide(slideName); if (slideName.indexOf('selected') != -1) { return false; } diff --git a/tools/droiddoc/templates/assets/images/bg_images_sprite.png b/tools/droiddoc/templates/assets/images/bg_images_sprite.png new file mode 100755 index 0000000000..84437e799e Binary files /dev/null and b/tools/droiddoc/templates/assets/images/bg_images_sprite.png differ diff --git a/tools/droiddoc/templates/assets/images/bg_logo.jpg b/tools/droiddoc/templates/assets/images/bg_logo.jpg deleted file mode 100755 index 3a9bb7a6f9..0000000000 Binary files a/tools/droiddoc/templates/assets/images/bg_logo.jpg and /dev/null differ diff --git a/tools/droiddoc/templates/assets/images/bg_logo.png b/tools/droiddoc/templates/assets/images/bg_logo.png new file mode 100755 index 0000000000..8c57fc48f0 Binary files /dev/null and b/tools/droiddoc/templates/assets/images/bg_logo.png differ diff --git a/tools/droiddoc/templates/assets/images/body-gradient-tab.png b/tools/droiddoc/templates/assets/images/body-gradient-tab.png new file mode 100644 index 0000000000..5223ac3a23 Binary files /dev/null and b/tools/droiddoc/templates/assets/images/body-gradient-tab.png differ diff --git a/tools/droiddoc/templates/assets/images/community-pic.psd b/tools/droiddoc/templates/assets/images/community-pic.psd deleted file mode 100755 index 3d8c22fcb2..0000000000 Binary files a/tools/droiddoc/templates/assets/images/community-pic.psd and /dev/null differ diff --git a/tools/droiddoc/templates/assets/images/home/IO-logo.png b/tools/droiddoc/templates/assets/images/home/IO-logo.png new file mode 100644 index 0000000000..65334c81a6 Binary files /dev/null and b/tools/droiddoc/templates/assets/images/home/IO-logo.png differ diff --git a/tools/droiddoc/templates/assets/images/home/bg_home_middle.png b/tools/droiddoc/templates/assets/images/home/bg_home_middle.png index dca13bae50..4221e96fc2 100644 Binary files a/tools/droiddoc/templates/assets/images/home/bg_home_middle.png and b/tools/droiddoc/templates/assets/images/home/bg_home_middle.png differ diff --git a/tools/droiddoc/templates/assets/images/home/carousel_buttons_sprite.png b/tools/droiddoc/templates/assets/images/home/carousel_buttons_sprite.png new file mode 100755 index 0000000000..e98c942801 Binary files /dev/null and b/tools/droiddoc/templates/assets/images/home/carousel_buttons_sprite.png differ diff --git a/tools/droiddoc/templates/assets/images/home/devphone-large.png b/tools/droiddoc/templates/assets/images/home/devphone-large.png new file mode 100755 index 0000000000..cbf94c81a8 Binary files /dev/null and b/tools/droiddoc/templates/assets/images/home/devphone-large.png differ diff --git a/tools/droiddoc/templates/assets/images/home/devphone-small.png b/tools/droiddoc/templates/assets/images/home/devphone-small.png new file mode 100755 index 0000000000..b8487f57a4 Binary files /dev/null and b/tools/droiddoc/templates/assets/images/home/devphone-small.png differ diff --git a/tools/droiddoc/templates/assets/images/home/market-large.png b/tools/droiddoc/templates/assets/images/home/market-large.png index 55ab924ed8..069fee712f 100644 Binary files a/tools/droiddoc/templates/assets/images/home/market-large.png and b/tools/droiddoc/templates/assets/images/home/market-large.png differ diff --git a/tools/droiddoc/templates/assets/images/home/sdk-large.png b/tools/droiddoc/templates/assets/images/home/sdk-large.png index ed0b8b28f3..315a1bfc8d 100644 Binary files a/tools/droiddoc/templates/assets/images/home/sdk-large.png and b/tools/droiddoc/templates/assets/images/home/sdk-large.png differ diff --git a/tools/droiddoc/templates/assets/images/home/sdk-small.png b/tools/droiddoc/templates/assets/images/home/sdk-small.png index f90fddaddf..0f1670d7f6 100644 Binary files a/tools/droiddoc/templates/assets/images/home/sdk-small.png and b/tools/droiddoc/templates/assets/images/home/sdk-small.png differ diff --git a/tools/droiddoc/templates/assets/images/sidenav-rule.png b/tools/droiddoc/templates/assets/images/sidenav-rule.png new file mode 100644 index 0000000000..eab9920633 Binary files /dev/null and b/tools/droiddoc/templates/assets/images/sidenav-rule.png differ diff --git a/tools/droiddoc/templates/assets/images/tab_default.jpg b/tools/droiddoc/templates/assets/images/tab_default.jpg deleted file mode 100755 index 0b4ecd4908..0000000000 Binary files a/tools/droiddoc/templates/assets/images/tab_default.jpg and /dev/null differ diff --git a/tools/droiddoc/templates/assets/images/tab_default.png b/tools/droiddoc/templates/assets/images/tab_default.png deleted file mode 100755 index de6ce05b11..0000000000 Binary files a/tools/droiddoc/templates/assets/images/tab_default.png and /dev/null differ diff --git a/tools/droiddoc/templates/assets/images/tab_hover.jpg b/tools/droiddoc/templates/assets/images/tab_hover.jpg deleted file mode 100755 index 5b745e3403..0000000000 Binary files a/tools/droiddoc/templates/assets/images/tab_hover.jpg and /dev/null differ diff --git a/tools/droiddoc/templates/assets/images/tab_hover.png b/tools/droiddoc/templates/assets/images/tab_hover.png deleted file mode 100755 index ee1d2bd0da..0000000000 Binary files a/tools/droiddoc/templates/assets/images/tab_hover.png and /dev/null differ diff --git a/tools/droiddoc/templates/assets/images/tab_selected.jpg b/tools/droiddoc/templates/assets/images/tab_selected.jpg deleted file mode 100755 index 0d7c810a5c..0000000000 Binary files a/tools/droiddoc/templates/assets/images/tab_selected.jpg and /dev/null differ diff --git a/tools/droiddoc/templates/assets/images/tab_selected.png b/tools/droiddoc/templates/assets/images/tab_selected.png deleted file mode 100755 index f259fda049..0000000000 Binary files a/tools/droiddoc/templates/assets/images/tab_selected.png and /dev/null differ diff --git a/tools/droiddoc/templates/assets/images/tabs.png b/tools/droiddoc/templates/assets/images/tabs.png deleted file mode 100755 index 437c97ca05..0000000000 Binary files a/tools/droiddoc/templates/assets/images/tabs.png and /dev/null differ diff --git a/tools/droiddoc/templates/assets/images/triangle-closed-small.png b/tools/droiddoc/templates/assets/images/triangle-closed-small.png index dc7591548c..002364a6a1 100644 Binary files a/tools/droiddoc/templates/assets/images/triangle-closed-small.png and b/tools/droiddoc/templates/assets/images/triangle-closed-small.png differ diff --git a/tools/droiddoc/templates/assets/images/triangle-opened-small.png b/tools/droiddoc/templates/assets/images/triangle-opened-small.png index 184031d040..e1eb784ff9 100644 Binary files a/tools/droiddoc/templates/assets/images/triangle-opened-small.png and b/tools/droiddoc/templates/assets/images/triangle-opened-small.png differ diff --git a/tools/droiddoc/templates/assets/images/video-droid.png b/tools/droiddoc/templates/assets/images/video-droid.png new file mode 100644 index 0000000000..25163b619c Binary files /dev/null and b/tools/droiddoc/templates/assets/images/video-droid.png differ diff --git a/tools/droiddoc/templates/assets/search_autocomplete.js b/tools/droiddoc/templates/assets/search_autocomplete.js index 392aa4659a..c9b6ff675a 100644 --- a/tools/droiddoc/templates/assets/search_autocomplete.js +++ b/tools/droiddoc/templates/assets/search_autocomplete.js @@ -70,7 +70,7 @@ function sync_selection_table(toroot) //if we have results, make the table visible and initialize result info if (gMatches.length > 0) { - filtered.className = "showing"; + document.getElementById("search_filtered_div").className = "showing"; var N = gMatches.length < ROW_COUNT ? gMatches.length : ROW_COUNT; for (i=0; i @@ -96,7 +104,7 @@ Summary: -| [Expand All] +| [Expand All]
@@ -288,7 +296,7 @@ Summary: @@ -336,7 +344,7 @@ Summary:
-
[Expand All]
+ [Expand]
Inherited XML Attributes
@@ -369,7 +377,7 @@ Summary:
-
[Expand All]
+ [Expand]
Inherited Constants
@@ -426,7 +434,7 @@ Summary:
-
[Expand All]
+ [Expand]
Inherited Fields
@@ -586,6 +594,8 @@ From - + + + diff --git a/tools/droiddoc/templates/classes.cs b/tools/droiddoc/templates/classes.cs index f8494e512f..abe8e4e0f1 100644 --- a/tools/droiddoc/templates/classes.cs +++ b/tools/droiddoc/templates/classes.cs @@ -1,3 +1,4 @@ + @@ -33,6 +34,8 @@ - + + + \ No newline at end of file diff --git a/tools/droiddoc/templates/customization.cs b/tools/droiddoc/templates/customization.cs index c5420bbcde..800c9c14b8 100644 --- a/tools/droiddoc/templates/customization.cs +++ b/tools/droiddoc/templates/customization.cs @@ -17,6 +17,8 @@ + + Build - diff --git a/tools/droiddoc/templates/docpage.cs b/tools/droiddoc/templates/docpage.cs index bd4d55130f..06b3f3598e 100644 --- a/tools/droiddoc/templates/docpage.cs +++ b/tools/droiddoc/templates/docpage.cs @@ -1,3 +1,4 @@ + @@ -31,8 +32,9 @@ - - + + + diff --git a/tools/droiddoc/templates/doctype.cs b/tools/droiddoc/templates/doctype.cs new file mode 100644 index 0000000000..643f992709 --- /dev/null +++ b/tools/droiddoc/templates/doctype.cs @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/tools/droiddoc/templates/footer.cs b/tools/droiddoc/templates/footer.cs index 9462cd0932..86b13eadd8 100644 --- a/tools/droiddoc/templates/footer.cs +++ b/tools/droiddoc/templates/footer.cs @@ -1,12 +1,19 @@ - + + +
+ +
+ + + + + \ No newline at end of file diff --git a/tools/droiddoc/templates/head_tag.cs b/tools/droiddoc/templates/head_tag.cs index acca3583df..bfd0eae507 100644 --- a/tools/droiddoc/templates/head_tag.cs +++ b/tools/droiddoc/templates/head_tag.cs @@ -1,5 +1,6 @@ + <?cs var:page.title ?> | <?cs if:guide ?>Guide | <?cs elif:reference ?>Reference | <?cs @@ -7,7 +8,7 @@ elif:sample ?>Samples | <?cs /if ?>Android Developers - + diff --git a/tools/droiddoc/templates/hierarchy.cs b/tools/droiddoc/templates/hierarchy.cs index 3529e0269d..a607ffd3d8 100644 --- a/tools/droiddoc/templates/hierarchy.cs +++ b/tools/droiddoc/templates/hierarchy.cs @@ -60,7 +60,9 @@ - + + + diff --git a/tools/droiddoc/templates/keywords.cs b/tools/droiddoc/templates/keywords.cs index 794da39174..0c8d4e3e8e 100644 --- a/tools/droiddoc/templates/keywords.cs +++ b/tools/droiddoc/templates/keywords.cs @@ -30,6 +30,8 @@ - + + + diff --git a/tools/droiddoc/templates/macros.cs b/tools/droiddoc/templates/macros.cs index 8f5fa8ed3b..ecbec2f8dd 100644 --- a/tools/droiddoc/templates/macros.cs +++ b/tools/droiddoc/templates/macros.cs @@ -223,10 +223,10 @@ This is deprecated. - + class="jd-expando-trigger-img" /> @@ -318,28 +318,27 @@ This is deprecated. -
-
[Expand All]
+ [Expand]
Inherited Methods
-
-
- + onkeyup="return search_changed(event, false, '')" /> +
+
- +
 
diff --git a/tools/droiddoc/templates/nosidenavpage.cs b/tools/droiddoc/templates/nosidenavpage.cs index 1b99d548de..41c30e9a19 100644 --- a/tools/droiddoc/templates/nosidenavpage.cs +++ b/tools/droiddoc/templates/nosidenavpage.cs @@ -1,3 +1,4 @@ + @@ -12,8 +13,9 @@ - - + + + diff --git a/tools/droiddoc/templates/package-descr.cs b/tools/droiddoc/templates/package-descr.cs index c1d3748bed..385ce23c64 100644 --- a/tools/droiddoc/templates/package-descr.cs +++ b/tools/droiddoc/templates/package-descr.cs @@ -1,3 +1,4 @@ + @@ -24,6 +25,8 @@ - + + + diff --git a/tools/droiddoc/templates/package.cs b/tools/droiddoc/templates/package.cs index becf48245d..7d1936d582 100644 --- a/tools/droiddoc/templates/package.cs +++ b/tools/droiddoc/templates/package.cs @@ -1,3 +1,4 @@ + @@ -44,6 +45,8 @@ - + + + diff --git a/tools/droiddoc/templates/packages.cs b/tools/droiddoc/templates/packages.cs index 3ef85b87cc..a358dca9f5 100644 --- a/tools/droiddoc/templates/packages.cs +++ b/tools/droiddoc/templates/packages.cs @@ -1,3 +1,4 @@ + @@ -30,6 +31,8 @@ - + + + diff --git a/tools/droiddoc/templates/sample.cs b/tools/droiddoc/templates/sample.cs index de0a0b0379..27b04304ba 100644 --- a/tools/droiddoc/templates/sample.cs +++ b/tools/droiddoc/templates/sample.cs @@ -1,3 +1,4 @@ + @@ -22,6 +23,8 @@ - + + + diff --git a/tools/droiddoc/templates/sampleindex.cs b/tools/droiddoc/templates/sampleindex.cs index 0fdb5d8e17..173ae70f64 100644 --- a/tools/droiddoc/templates/sampleindex.cs +++ b/tools/droiddoc/templates/sampleindex.cs @@ -1,3 +1,4 @@ + @@ -36,6 +37,8 @@ - + + + diff --git a/tools/droiddoc/templates/analytics.cs b/tools/droiddoc/templates/trailer.cs similarity index 73% rename from tools/droiddoc/templates/analytics.cs rename to tools/droiddoc/templates/trailer.cs index 44df1dbca6..155ba584b2 100644 --- a/tools/droiddoc/templates/analytics.cs +++ b/tools/droiddoc/templates/trailer.cs @@ -1,4 +1,7 @@ + +