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

Commit f1dcbf6c authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'eclair' of git://android.git.kernel.org/platform/frameworks/base into HEAD 

Conflicts:
	services/java/com/android/server/PackageManagerService.java
parents 64ea9145 7d39f981

Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -403,10 +403,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) \

core/java/android/view/View.java

+3 −0
Original line number Diff line number Diff line
@@ -8210,6 +8210,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
     * Cancels any animations for this view.

     */

    public void clearAnimation() {

        if (mCurrentAnimation != null) {

            mCurrentAnimation.detach();

        }

        mCurrentAnimation = null;

    }

core/java/android/view/animation/Animation.java

+33 −1
Original line number Diff line number Diff line
@@ -255,6 +255,38 @@ public abstract class Animation implements Cloneable { 
        mOneMoreTime = true;

    }



    /**

     * Cancel the animation. Cancelling an animation invokes the animation

     * listener, if set, to notify the end of the animation.

     * 

     * If you cancel an animation manually, you must call {@link #reset()}

     * before starting the animation again.

     * 

     * @see #reset() 

     * @see #start() 

     * @see #startNow() 

     * @hide

     */

    public void cancel() {

        if (mStarted && !mEnded) {

            if (mListener != null) mListener.onAnimationEnd(this);

            mEnded = true;

        }

        // Make sure we move the animation to the end

        mStartTime = Long.MIN_VALUE;

        mMore = mOneMoreTime = false;

    }



    /**

     * @hide

     */

    public void detach() {

        if (mStarted && !mEnded) {

            mEnded = true;

            if (mListener != null) mListener.onAnimationEnd(this);

        }

    }



    /**

     * Whether or not the animation has been initialized.

     *
@@ -745,10 +777,10 @@ public abstract class Animation implements Cloneable { 
        if (expired) {

            if (mRepeatCount == mRepeated) {

                if (!mEnded) {

                    mEnded = true;

                    if (mListener != null) {

                        mListener.onAnimationEnd(this);

                    }

                    mEnded = true;

                }

            } else {

                if (mRepeatCount > 0) {

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 -->