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

Commit f11d7d55 authored by Dirk Dougherty's avatar Dirk Dougherty
Browse files

Add support for preview SDK handling in doc templates. Add preview SDK docs. 

Bug: 2031559
parent 2dce6988

Android.mk

+14 −9
Original line number Diff line number Diff line
@@ -349,14 +349,15 @@ web_docs_sample_code_flags := \ 
		-samplecode $(sample_dir)/NotePad \

		            guide/samples/NotePad "Note Pad"



# SDK version identifiers used in the published docs. 



# major[.minor] version for SDK. Typically identical to the 

# most current Android platform version included in the SDK package. 

## SDK version identifiers used in the published docs

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

framework_docs_SDK_VERSION:=1.5

# release version for SDK (ie "Release x")

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

framework_docs_SDK_REL_ID:=3

  # 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:=true



framework_docs_LOCAL_DROIDDOC_OPTIONS += \

		-hdf sdk.version $(framework_docs_SDK_VERSION) \
@@ -387,6 +388,10 @@ LOCAL_DROIDDOC_OPTIONS:=\ 
		-warning 3 \

		-hdf android.whichdoc offline 



ifeq ($(framework_docs_SDK_PREVIEW),true)

  LOCAL_DROIDDOC_OPTIONS += -hdf sdk.current preview 

endif



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk

LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk

docs/html/guide/tutorials/views/hello-mapview.jd

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ parent.link=index.html 


<div class="special">

<p>This tutorial requires that you have the Google Maps external library

installed in your SDK environment. By default the Android 1.5 SDK includes the

installed in your SDK environment. By default the Android SDK includes the

Google APIs add-on, which in turn includes the Maps external library. If you

don't have the Google APIs SDK add-on, you can download it from this

location:</p>

docs/html/sdk/1.5_r3/index.jd

+1 −0
Original line number Diff line number Diff line 
sdk.version=1.5

sdk.rel.id=3



sdk.date=July 2009



sdk.win_download=android-sdk-windows-1.5_r3.zip

docs/html/sdk/1.5_r3/upgrading.jd

+1 −0
Original line number Diff line number Diff line 
page.title=Upgrading the SDK

sdk.version=1.5

sdk.rel.id=3



@jd:body

docs/html/sdk/adt_download.jd

+9 −2
Original line number Diff line number Diff line
@@ -26,13 +26,20 @@ page</a>. 
  </tr>



  <tr>

     <td>0.9.2</td>

     <td><a href="http://dl-ssl.google.com/android/ADT-0.9.2.zip">ADT-0.9.2.zip</a></td>

     <td><nobr>bytes</nobr></td>

     <td><nobr></nobr></td>

     <td><nobr>Required for users of Android 1.6 SDK (and later releases). Updated from 0.9.1. <em><nobr>August 2009</nobr></em></td>

  </tr>

  <tr class="alt-color">

     <td>0.9.1</td>

     <td><a href="http://dl-ssl.google.com/android/ADT-0.9.1.zip">ADT-0.9.1.zip</a></td>

     <td><nobr>2916093 bytes</nobr></td>

     <td><nobr>e7b2ab40414ac98</nobr></td>

     <td><nobr>Required for users of Android 1.5 SDK (and later releases). Updated from 0.9.0. <em><nobr>6 May 2009</nobr></em></td>

  </tr>

  <tr class="alt-color">

  <tr>

     <td>0.8.0</td>

     <td><a href="http://dl-ssl.google.com/android/ADT-0.8.0.zip">ADT-0.8.0.zip</a></td>

     <td colspan="2"><nobr>&nbsp;</nobr></td>
@@ -41,7 +48,7 @@ page</a>. 
</table>





<h4>Older Versions of ADT</h4>

<h4>Obsolete Versions of ADT</h4>



<p>The table below lists older versions of the ADT Plugin that are no longer supported. If you are developing applications that are intended to be deployable to Android-powered devices, make sure that you upgrade to the most current SDK release available and use the most current version of the ADT Plugin, as listed in the section above.</p>