From 9519eab313fdb0f74a05e85cffe25b61aa76a5dd Mon Sep 17 00:00:00 2001 From: Dirk Dougherty Date: Tue, 14 Sep 2010 18:15:08 -0700 Subject: [PATCH] Doc change: clean up droiddoc (cs) macros. Change-Id: I84b08a573fea42686a41ff694f1a52e8fb760dc5 --- Android.mk | 17 ++--------------- .../html/guide/topics/resources/localization.jd | 12 ++++++------ docs/html/sdk/adt_download.jd | 4 ++-- docs/html/sdk/android-1.5.jd | 4 +--- docs/html/sdk/android-1.6.jd | 4 +--- docs/html/sdk/android-2.0.1.jd | 4 +--- docs/html/sdk/android-2.0.jd | 4 +--- docs/html/sdk/android-2.1.jd | 3 +-- docs/html/sdk/eclipse-adt.jd | 4 ++++ 9 files changed, 19 insertions(+), 37 deletions(-) diff --git a/Android.mk b/Android.mk index 914ffa3c8a51e..9f67be9f364ea 100644 --- a/Android.mk +++ b/Android.mk @@ -427,25 +427,12 @@ web_docs_sample_code_flags := \ framework_docs_SDK_VERSION:=2.2 # release version (ie "Release x") (full releases only) framework_docs_SDK_REL_ID:=1 - # name of current SDK directory (full releases only) -framework_docs_SDK_CURRENT_DIR:=$(framework_docs_SDK_VERSION)_r$(framework_docs_SDK_REL_ID) # flag to build offline docs for a preview release framework_docs_SDK_PREVIEW:=0 -## Latest ADT version identifiers, for reference from published docs -framework_docs_ADT_VERSION:=0.9.8 -framework_docs_ADT_DOWNLOAD:=ADT-0.9.8.zip -framework_docs_ADT_BYTES:=8301417 -framework_docs_ADT_CHECKSUM:=27e0de800512f13feae46fb554e6ee2f - framework_docs_LOCAL_DROIDDOC_OPTIONS += \ -hdf sdk.version $(framework_docs_SDK_VERSION) \ - -hdf sdk.rel.id $(framework_docs_SDK_REL_ID) \ - -hdf sdk.current $(framework_docs_SDK_CURRENT_DIR) \ - -hdf adt.zip.version $(framework_docs_ADT_VERSION) \ - -hdf adt.zip.download $(framework_docs_ADT_DOWNLOAD) \ - -hdf adt.zip.bytes $(framework_docs_ADT_BYTES) \ - -hdf adt.zip.checksum $(framework_docs_ADT_CHECKSUM) + -hdf sdk.rel.id $(framework_docs_SDK_REL_ID) # ==== the api stubs and current.xml =========================== include $(CLEAR_VARS) @@ -529,7 +516,7 @@ LOCAL_DROIDDOC_OPTIONS:=\ -hdf android.whichdoc offline ifeq ($(framework_docs_SDK_PREVIEW),true) - LOCAL_DROIDDOC_OPTIONS += -hdf sdk.current preview + LOCAL_DROIDDOC_OPTIONS += -hdf sdk.preview true endif LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk diff --git a/docs/html/guide/topics/resources/localization.jd b/docs/html/guide/topics/resources/localization.jd index 3d630c9d06703..36e12f6664448 100755 --- a/docs/html/guide/topics/resources/localization.jd +++ b/docs/html/guide/topics/resources/localization.jd @@ -433,12 +433,12 @@ Menu > Settings > Locale & text > Select locale).

href="{@docRoot}guide/developing/tools/emulator.html">Android Emulator.

Creating and using a custom locale

-

A "custom" locale is a language/region combination that the -Android system image does not explicitly support. (For a list of supported -locales, see the Android -Version Notes.) You can test how your application will run in a custom -locale by creating a custom locale in the emulator. There are two ways to do -this:

+

A "custom" locale is a language/region combination that the Android +system image does not explicitly support. (For a list of supported locales in +Android platforms see the Version Notes in the SDK tab). You can test +how your application will run in a custom locale by creating a custom locale in +the emulator. There are two ways to do this: