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

Commit e0030418 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels. 

Merge commit 'bca9f1bb' into eclair-mr2

* commit 'bca9f1bb':
  sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
parents b2796da2 bca9f1bb

Android.mk

+6 −5
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -since ./frameworks/base/api/3.xml 3 \

    -since ./frameworks/base/api/4.xml 4 \

    -since ./frameworks/base/api/5.xml 5 \

    -since ./frameworks/base/api/6.xml 6 \

		-error 1 -error 2 -warning 3 -error 4 -error 6 -error 8 \

		-overview $(LOCAL_PATH)/core/java/overview.html
@@ -375,7 +376,7 @@ web_docs_sample_code_flags := \ 


## SDK version identifiers used in the published docs

  # major[.minor] version for current SDK. (full releases only)

framework_docs_SDK_VERSION:=2.0

framework_docs_SDK_VERSION:=2.0.1

  # release version (ie "Release x")  (full releases only)

framework_docs_SDK_REL_ID:=1

  # name of current SDK directory (full releases only)
@@ -384,10 +385,10 @@ framework_docs_SDK_CURRENT_DIR:=$(framework_docs_SDK_VERSION)_r$(framework_docs_ 
framework_docs_SDK_PREVIEW:=0



## Latest ADT version identifiers, for reference from published docs

framework_docs_ADT_VERSION:=0.9.4

framework_docs_ADT_DOWNLOAD:=ADT-0.9.4.zip

framework_docs_ADT_BYTES:=3367536

framework_docs_ADT_CHECKSUM:=4cdecd72b3e28022d8a55891f13e7d43

framework_docs_ADT_VERSION:=0.9.5

framework_docs_ADT_DOWNLOAD:=ADT-0.9.5.zip

framework_docs_ADT_BYTES:=3372982

framework_docs_ADT_CHECKSUM:=227ec538359fbe417ccde7f0ad614a96



framework_docs_LOCAL_DROIDDOC_OPTIONS += \

		-hdf sdk.version $(framework_docs_SDK_VERSION) \

docs/html/guide/appendix/api-levels.jd

+2 −1
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ Android platform.</p> 


<table>

  <tr><th>Platform Version</th><th>API Level</th></tr>

  <tr><td>Android 2.0.1</td><td>6</td></tr>

  <tr><td>Android 2.0</td><td>5</td></tr>

  <tr><td>Android 1.6</td><td>4</td></tr>

  <tr><td>Android 1.5</td><td>3</td></tr>
@@ -111,7 +112,7 @@ the Android system itself. </p> 
<p>Applications can use a manifest element provided by the framework API &mdash;

<code>&lt;uses-sdk&gt;</code> &mdash; to describe the minimum and maximum API

Levels under which they are able to run, as well as the preferred API Level that

they are designed to support. The element offers two key attributes:</p>

they are designed to support. The element offers three key attributes:</p>



<ul>

<li><code>android:minSdkVersion</code> &mdash; Specifies the minimum API Level

docs/html/guide/developing/tools/layoutopt.jd

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ samples/useless.xml 
   11:17 This LinearLayout layout or its FrameLayout parent is useless</pre>



<p>The <code>layoutopt</code> tool is available in SDK Tools, Revision 3 or

later. If you do not have SDK Tools 3 or later installed in your SDK, you can

later. If you do not have SDK Tools r3 or later installed in your SDK, you can

download it from the Android SDK repository site using the Android SDK and AVD

Manager. For information, see <a

href="{@docRoot}sdk/adding-components.html">Adding SDK Components</a>.</p>

docs/html/guide/practices/screens_support.jd

+1 −3
Original line number Diff line number Diff line
@@ -700,9 +700,7 @@ to the baseline screen configuration.</td> 
example, if your application is designed to run on both Android 1.5 (API Level

3) and Android 1.6 (API Level 4 and higher), you can use the <code>-v4</code>

qualifier to tag any resources that should be excluded when your application is

running on Android 1.5 (API Level 3). Using the version qualifier is necessary

in some cases, if the older platform is inadvertently loading resources from a

directory containing resources for a newer platform. </td>

running on Android 1.5 (API Level 3).  </td>

</tr>

</table>

docs/html/sdk/RELEASENOTES.jd

+4 −4
Original line number Diff line number Diff line
@@ -28,16 +28,16 @@ keep your development environment up-to-date. </li> 


<p>Note that if you are currently using the Android 1.6 SDK, you do not

necessarily need to install the new SDK, since your existing SDK already

includes the Android SDK and AVD Manager tool. To develop against Android 2.0,

for example, you could just download the Android 2.0 platform into your existing

includes the Android SDK and AVD Manager tool. To develop against Android 2.0.1,

for example, you could just download the Android 2.0.1 platform into your existing

SDK. </p>



<p>Release notes for Android platforms and other SDK components are

now available from the "SDK" tab, under "Downloadable SDK Components."</p>



<ul>

<li>Notes for the Android 2.0 platform are in the <a

href="{@docRoot}sdk/android-2.0.html">Android 2.0, Release 1</a> document. </li>

<li>Notes for the Android 2.0.1 platform are in the <a

href="{@docRoot}sdk/android-2.0.1.html">Android 2.0.1, Release 1</a> document. </li>

<li>You can find information about tools changes in the <a

href="{@docRoot}sdk/tools-notes.html">SDK Tools Notes</a> and <a

href="{@docRoot}sdk/adt-notes.html">ADT Plugin Notes</a>.</li>