Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread

Browse Source 
Merge commit '9afd90939b1c2b298592b803c0bfa0b54ff7e453' into gingerbread-plus-aosp

* commit '9afd90939b1c2b298592b803c0bfa0b54ff7e453':
  Doc change: clean up droiddoc (cs) macros.
This commit is contained in:
Dirk Dougherty
2010-09-16 11:19:54 -07:00
committed by Android Git Automerger
parent 03335af0db 9afd90939b
commit 8ee9ecc145
9 changed files with 19 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Android.mk
View File

@@ -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

12
docs/html/guide/topics/resources/localization.jd
View File

@@ -433,12 +433,12 @@ Menu &gt; Settings &gt; Locale &amp; text &gt; Select locale). </p>
href="{@docRoot}guide/developing/tools/emulator.html">Android Emulator</a>.</p>
<h4>Creating and using a custom locale</h4>
<p>A &quot;custom&quot; locale is a language/region combination that the
Android system image does not explicitly support. (For a list of supported
locales, see the <a href="{@docRoot}sdk/android-{@sdkCurrentVersion}.html">Android
Version Notes</a>.) 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:</p>
<p>A &quot;custom&quot; 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 <a
href="{@docRoot}sdk/index.html">SDK</a> 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:</p>
<ul>
<li>Use the Custom Locale application, which is accessible from the

4
docs/html/sdk/adt_download.jd
View File

@@ -24,8 +24,8 @@ ADT Installation</a>.</p>
<tr>
<td>0.9.8</td>
<td><a href="http://dl-ssl.google.com/android/ADT-0.9.8.zip">ADT-0.9.8.zip</a></td>
<td><nobr>{@adtZipBytes} bytes</nobr></td>
<td>{@adtZipChecksum}</td>
<td><nobr>8703591 bytes</nobr></td>
<td>22070f8e52924605a3b3abf87c1ba39f</td>
<td>Requires SDK Tools, Revision 7 <em><nobr>September 2010</nobr></em></td>
</tr>
<tr>

4
docs/html/sdk/android-1.5.jd
View File

@@ -2,8 +2,6 @@ page.title=Android 1.5 Platform
sdk.platform.version=1.5
sdk.platform.apiLevel=3
sdk.platform.majorMinor=major
sdk.platform.releaseDate=April 2009
sdk.platform.deployableDate=May 2009
@jd:body
@@ -43,7 +41,7 @@ Differences Report &raquo;</a> </li>
<em>API Level:</em>&nbsp;<strong>{@sdkPlatformApiLevel}</strong></p>
<p>Android {@sdkPlatformVersion} is a {@sdkPlatformMajorMinor} platform release
deployable to Android-powered handsets starting in {@sdkPlatformDeployableDate}.
deployable to Android-powered handsets starting in May 2009.
The release includes new features for users and developers, as well as changes
in the Android framework API. </p>

4
docs/html/sdk/android-1.6.jd
View File

@@ -2,8 +2,6 @@ page.title=Android 1.6 Platform
sdk.platform.version=1.6
sdk.platform.apiLevel=4
sdk.platform.majorMinor=minor
sdk.platform.releaseDate=December 2009
sdk.platform.deployableDate=October 2009
@jd:body
@@ -43,7 +41,7 @@ Differences Report &raquo;</a> </li>
<em>API Level:</em>&nbsp;<strong>{@sdkPlatformApiLevel}</strong></p>
<p>Android {@sdkPlatformVersion} is a {@sdkPlatformMajorMinor} platform release
deployable to Android-powered handsets since {@sdkPlatformDeployableDate}.
deployable to Android-powered handsets since October 2009.
The platform includes new features for users and developers, as well as changes
in the Android framework API. </p>

4
docs/html/sdk/android-2.0.1.jd
View File

@@ -2,8 +2,6 @@ page.title=Android 2.0.1, Release 1
sdk.platform.version=2.0.1
sdk.platform.apiLevel=6
sdk.platform.majorMinor=minor
sdk.platform.releaseDate=December 2009
sdk.platform.deployableDate=December 2009
@jd:body
@@ -44,7 +42,7 @@ differences report &raquo;</a> </li>
<em>API Level:</em>&nbsp;<strong>{@sdkPlatformApiLevel}</strong></p>
<p>Android {@sdkPlatformVersion} is a {@sdkPlatformMajorMinor} platform release
deployable to Android-powered handsets starting in {@sdkPlatformDeployableDate}.
deployable to Android-powered handsets starting in December 2009.
This release includes minor API
changes, bug fixes and framework behavioral changes. For information on changes
and fixes, see the <a href="#api">Framework API</a> section.</p>

4
docs/html/sdk/android-2.0.jd
View File

@@ -2,8 +2,6 @@ page.title=Android 2.0, Release 1
sdk.platform.version=2.0
sdk.platform.apiLevel=5
sdk.platform.majorMinor=major
sdk.platform.releaseDate=October 2009
sdk.platform.deployableDate=November 2009
@jd:body
@@ -38,7 +36,7 @@ sdk.platform.deployableDate=November 2009
<em>API Level:</em>&nbsp;<strong>{@sdkPlatformApiLevel}</strong></p>
<p>Android {@sdkPlatformVersion} is a {@sdkPlatformMajorMinor} platform release
deployable to Android-powered handsets starting in {@sdkPlatformDeployableDate}.
deployable to Android-powered handsets starting in November 2009.
The release includes new features for users and developers, as well as changes
in the Android framework API. </p>

3
docs/html/sdk/android-2.1.jd
View File

@@ -2,7 +2,6 @@ page.title=Android 2.1 Platform
sdk.platform.version=2.1
sdk.platform.apiLevel=7
sdk.platform.majorMinor=minor
sdk.platform.deployableDate=January 2010
@jd:body
@@ -42,7 +41,7 @@ Differences Report &raquo;</a> </li>
<em>API Level:</em>&nbsp;<strong>{@sdkPlatformApiLevel}</strong></p>
<p>Android {@sdkPlatformVersion} is a {@sdkPlatformMajorMinor} platform release
deployable to Android-powered handsets starting in {@sdkPlatformDeployableDate}.
deployable to Android-powered handsets starting in January 2010.
This release includes new API
changes and bug fixes. For information on changes, see the <a href="#api">Framework API</a>
section.</p>

4
docs/html/sdk/eclipse-adt.jd
View File

@@ -1,5 +1,9 @@
page.title=ADT Plugin for Eclipse
sdk.preview=0
adt.zip.version=0.9.8
adt.zip.download=ADT-0.9.8.zip
adt.zip.bytes=8703591
adt.zip.checksum=22070f8e52924605a3b3abf87c1ba39f
@jd:body