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

Commit 1dd6b0c8 authored by android-build SharedAccount's avatar android-build SharedAccount
Browse files

Merge commit 'goog/eclair' into eclair-release

parents 1f48925a f0cdfa99

Android.mk

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

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

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

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

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

		-overview $(LOCAL_PATH)/core/java/overview.html

docs/html/resources/dashboard/platform-versions.jd

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ div.dashboard-panel th { 
<p>This page provides data about the relative number of active devices

running a given version of the Android platform. This can help you

understand the landscape of device distribution and decide how to prioritize

the development of your application features for the devices currently in the

the development of your application features for the devices currently in

the hands of users.</p>



<p class="note"><strong>Note:</strong> This data is based on the number

docs/html/resources/samples/index.jd

+5 −7
Original line number Diff line number Diff line 
guide=true

page.title=Sample Code

@jd:body





<p>Sometimes, the best way to learn how things are done is to look at some code.

Here, you can browse the source of some sample Android applications that are included

in the Android SDK.</p>

<p>Sometimes, the best way to learn how things are done is to look at some code.</p>



<p>Each version of the Android platform available for the SDK includes a full set of sample

<p>Here, you can browse the source of some sample Android applications. Also, each version of the

Android platform available for the SDK includes a set of sample

applications (which may vary between different versions of the platform).

You can find the samples in your SDK at:</p>
@@ -53,7 +51,7 @@ platforms) and allow you to view the source files in your browser. </p> 
  <dd>A home screen replacement application.</dd>

  

 <dt><a href="JetBoy/index.html">JetBoy</a></dt>

  <dd>JetBoy is a game that demonstrates the SONiVOX JET interactive music technology,

  <dd>A game that demonstrates the SONiVOX JET interactive music technology,

  with {@link android.media.JetPlayer}.</dd>

    

 <dt><a href="LunarLander/index.html">Lunar Lander</a></dt>
@@ -77,7 +75,7 @@ platforms) and allow you to view the source files in your browser. </p> 
 <dt><a href="SoftKeyboard/index.html">Soft Keyboard</a></dt>

  <dd>An example of writing an input method for a software keyboard.</dd>



 <dt><a href=Wiktionary/index.html">Wiktionary</a></dt>

 <dt><a href="Wiktionary/index.html">Wiktionary</a></dt>

  <dd>An example of creating interactive widgets for display on the Android

  home screen.</dd>

docs/html/sdk/android-2.1.jd

+1 −2
Original line number Diff line number Diff line
@@ -211,8 +211,7 @@ href="{@docRoot}guide/appendix/api-levels.html">API Levels</a> document. </p> 


<h4>Live Wallpapers</h4>



<p>The following additions provide APIs for you to develop active (and

interactive) wallpapers:</p>

<p>The following additions provide APIs for you to develop animated wallpapers:</p>

<ul>

<li>New {@link android.service.wallpaper} package.</li>

<li>New {@link android.app.WallpaperInfo} class.</li>

docs/html/shareables/latest_samples.zip

−11.4 KiB (6.54 MiB)

File changed.

No diff preview for this file type.

View original file
View changed file