Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9afd9093 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android (Google) Code Review
Browse files

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

parents 567c00a8 9519eab3

Android.mk

+2 −15
Original line number Diff line number Diff line
@@ -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

docs/html/guide/topics/resources/localization.jd

+6 −6
Original line number Diff line number Diff line
@@ -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

docs/html/sdk/adt_download.jd

+2 −2
Original line number Diff line number Diff line
@@ -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>

docs/html/sdk/android-1.5.jd

+1 −3
Original line number Diff line number Diff line
@@ -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>

docs/html/sdk/android-1.6.jd

+1 −3
Original line number Diff line number Diff line
@@ -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>