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

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

am f9b2ad0a: am 1f196f29: Merge "cherry-pick... 

am f9b2ad0a: am 1f196f29: Merge "cherry-pick af4786bc to froyo" into froyo
parents 027ec01c f9b2ad0a

Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -425,10 +425,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.5

framework_docs_ADT_DOWNLOAD:=ADT-0.9.5.zip

framework_docs_ADT_BYTES:=3372982

framework_docs_ADT_CHECKSUM:=227ec538359fbe417ccde7f0ad614a96

framework_docs_ADT_VERSION:=0.9.6

framework_docs_ADT_DOWNLOAD:=ADT-0.9.6.zip

framework_docs_ADT_BYTES:=7456339

framework_docs_ADT_CHECKSUM:=ea45d271be52b87b5dd1c9fb17536223



framework_docs_LOCAL_DROIDDOC_OPTIONS += \

		-hdf sdk.version $(framework_docs_SDK_VERSION) \

docs/html/guide/appendix/media-formats.jd

+0 −51
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ page.title=Android Supported Media Formats 
@jd:body



<p>The <a href="#core">Core Media Formats</a> table below describes the media format support built into the Android platform. Note that any given mobile device may provide support for additional formats or file types not listed in the table. </p>

<p>For your convenience, the table <a href="#g1">T-Mobile G1 Media Formats</a> describes additional media formats and characteristics provided by the T-Mobile G1 device. Other devices may support additional formats not listed on this page. </p>



<p>As an application developer, you are free to make use of any media codec that is available on any Android-powered device, including those provided by the Android platform and those that are device-specific.</p>
@@ -152,56 +151,6 @@ page.title=Android Supported Media Formats 


</tbody></table>



<h2 id="g1">T-Mobile G1 Media Formats and Characteristics</h2>



<p>The table below lists media formats supported by the T-Mobile G1 in addition to those provided as part of the Android platform. This table also details G1-specific performance characteristics of some Android core media formats.</p>



<table>

<tbody>



<tr>

<th>Type</th>

<th>Format</th>

<th>Encoder</th>

<th>Decoder</th>

<th>Comment</th>

<th>File Type(s) Supported</th>

</tr>



<tr>

<td>Audio</td>

<td>WMA</td>

<td>&nbsp;</td>

<td style="text-align: center;">X</td>

<td>Supports WMA standard L1-L3:

<ul>

<li>L1: 64 kbps - 161 kbps @ 44.1kHz</li>

<li>L2: &lt;=161 kbps &lt;=48 kHz</li>

<li>L3: &lt;385 kbps &lt;=48 kHz</li>

</ul>

Mono and stereo profiles with 16-bits per sample. Decoder does not support WMA Pro, Lossless, or Speech codecs. 

</td>

<td>Windows Media Audio (.wma)</td>

</tr>



<tr>

<td rowspan="2">Video</td>

<td>WMV</td>

<td>&nbsp;</td>

<td style="text-align: center;">X</td>

<td>Versions 7, 8 and 9. Simple profile only</td>

<td>Windows Media Video (.wmv)</td>

</tr>



<tr>

<td>H.264&nbsp;AVC</td>

<td>&nbsp;</td>

<td style="text-align: center;">X</td>

<td>On the G1, this decoder is limited to baseline profile up to 480x320, and 600 kbps average bitrate for the video stream.</td>

<td>3GPP (.3gp) and MPEG-4 (.mp4)</td>

</tr>



</tbody></table>

docs/html/index.jd

+4 −4
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ home=true 
                            </div><!-- end homeTitle -->

                            <div id="announcement-block">

                            <!-- total max width is 520px -->

                                  <img src="/assets/images/home/Android_Dev_Lab_l.png" alt="Android developer labs" width="100px" style="padding-left:78px;padding-right:46px;padding-bottom: 8px;"/>

                                  <img src="{@docRoot}assets/images/home/gdc-logo.png" alt="Android at GDC 2010" width="203px" style="padding-left:22px;padding-bottom:28px;padding-top:22px;"/>

                                  <div id="announcement" style="width:275px">

<p>We're hosting the next Android Developer Lab in Barcelona at <a href="http://www.mobileworldcongress.com/index.htm">Mobile World Congress&nbsp;&raquo;</a> on Wednesday February 17th at <a href="http://www.mobileworldcongress.com/exhibition/app_planet.htm">App Planet&nbsp;&raquo;</a>, located in Hall 7.  Come visit us to attend a technical presentation, talk to our Android developer relations team, and meet other members of the developer community.</p><p><a href="http://sites.google.com/site/androidmwc/home">Learn more &raquo;</a></p>

<!--<p><a href="http://android-developers.blogspot.com/2009/11/bring-your-lab-coats.html">Learn more &raquo;</a></p>-->

<p>Android will be at the <a href="http://www.gdconf.com/">2010 Game Developers Conference</a> in San Francisco, from March 9th to 11th. We're looking forward to seeing you there!</p>

<p><a href="http://android-developers.blogspot.com/2010/03/android-at-game-developers-conference.html">Learn more &raquo;</a></p>

                                </div> <!-- end annoucement -->

                            </div> <!-- end annoucement-block -->

                        </div><!-- end topAnnouncement -->

docs/html/resources/community-groups.jd

+15 −9
Original line number Diff line number Diff line
@@ -2,14 +2,14 @@ community=true 
page.title=Developer Forums

@jd:body



<p>Welcome to the Android developers community! We're glad you're here and invite you to participate in discussions with other Android application developers on topics that interest you.</p>



<p>The lists on this page are primarily for discussion about Android application development. If you are seeking discussion about Android source code (not application development), then please refer to the <a href="http://source.android.com/discuss">Open Source Project Mailing lists</a>.</p>

<div id="qv-wrapper">

<div id="qv">



<p style="margin-bottom:.5em"><strong>Contents</strong></p>

<ol class="toc">

  <li><a href="#StackOverflow">Stack Overflow</a> <span class="new">new!</span></li>

  <li><a href="#MailingLists">Mailing lists</a><ol>

  <h2>In this document</h2>

  <ol>

  <li><a href="#StackOverflow">Android on Stack Overflow</a></li>

  <li><a href="#MailingLists">Mailing lists</a>

  <ol>

    <li><a href="#BeforeYouPost">Before you post</a></li>

    <li><a href="#UsingEmail">Using email with the mailing lists</a></li>

    <li><a href="#ApplicationDeveloperLists">Application developer mailing lists</a></li>
@@ -17,6 +17,12 @@ page.title=Developer Forums 
  <li><a href="#MarketHelp">Android Market Help Forum</a></li>

  </ol>



</div>

</div>



<p>Welcome to the Android developers community! We're glad you're here and invite you to participate in discussions with other Android application developers on topics that interest you.</p>



<p>The lists on this page are primarily for discussion about Android application development. If you are seeking discussion about Android source code (not application development), then please refer to the <a href="http://source.android.com/discuss">Open Source Project Mailing lists</a>.</p>



<h2 id="StackOverflow">Stack Overflow</h2>

docs/html/resources/community-more.jd

+4 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ community=true 
page.title=IRC and Twitter

@jd:body



<p>In addition to the <a href="community-groups.html">Android developer groups</a>, you can also participate in the Android developer community through IRC, and you can also follow us on Twitter. </p>

<p>In addition to the <a href="community-groups.html">Android developer forums</a>, you can participate in the Android developer community through IRC and you can follow us on Twitter. </p>



<h3 id="irc">IRC</h3>
@@ -31,10 +31,10 @@ page.title=IRC and Twitter 
<ul>

<li>Set your nickname before you join the channel.</li>

<li>Registering your nickname prevents others from using your nickname or impersonating you later:

<pre>/nick &lt;yournickname&gt;

/msg nickserv register &lt;password&gt; &lt;email&gt;</code></pre>

<pre class="no-pretty-print" style="width:50%;">/nick &lt;yournickname&gt;

/msg nickserv register &lt;password&gt; &lt;email&gt;</pre>

<p>Afterwards, when you connect, you'll need to supply a password:</p>

<pre>/connect irc.freenode.net

<pre class="no-pretty-print" style="width:50%;">/connect irc.freenode.net

/nick &lt;yournickname&gt;

/msg nickserv identify &lt;password&gt;

/join #android-dev</pre>