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

Commit e38b1fbd authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'eclair' into eclair-release

parents dcce5a16 1296d562

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -357,6 +357,8 @@ web_docs_sample_code_flags := \ 
		-hdf android.hasSamples 1 \

		-samplecode $(sample_dir)/ApiDemos \

		            guide/samples/ApiDemos "API Demos" \

    -samplecode $(sample_dir)/BluetoothChat \

                guide/samples/BluetoothChat "Bluetooth Chat" \

		-samplecode $(sample_dir)/Home \

		            guide/samples/Home "Home" \

		-samplecode $(sample_dir)/JetBoy \

api/7.xml

0 → 100644
+371697 −0

File added.

Preview size limit exceeded, changes collapsed.

core/java/android/content/SyncManager.java

+6 −2
Original line number Diff line number Diff line
@@ -919,12 +919,16 @@ class SyncManager implements OnAccountsUpdateListener { 
                    + previousSyncOperation);

        }



        // If this sync aborted because the internal sync loop retried too many times then

        //   don't reschedule. Otherwise we risk getting into a retry loop.

        // If the operation succeeded to some extent then retry immediately.

        // If this was a two-way sync then retry soft errors with an exponential backoff.

        // If this was an upward sync then schedule a two-way sync immediately.

        // Otherwise do not reschedule.



        if (syncResult.madeSomeProgress()) {

        if (syncResult.tooManyRetries) {

            Log.d(TAG, "not retrying sync operation because it retried too many times: "

                    + previousSyncOperation);

        } else if (syncResult.madeSomeProgress()) {

            if (isLoggable) {

                Log.d(TAG, "retrying sync operation immediately because "

                        + "even though it had an error it achieved some success");

core/java/com/android/internal/widget/SlidingTab.java

+26 −12
Original line number Diff line number Diff line
@@ -433,9 +433,16 @@ public class SlidingTab extends ViewGroup { 
            return tab.getMeasuredHeight();

        }



        public void startAnimation(Animation animation) {

            tab.startAnimation(animation);

            text.startAnimation(animation);

        /**

         * Start animating the slider. Note we need two animations since an Animator

         * keeps internal state of the invalidation region which is just the view being animated.

         * 

         * @param anim1

         * @param anim2

         */

        public void startAnimation(Animation anim1, Animation anim2) {

            tab.startAnimation(anim1);

            text.startAnimation(anim2);

        }



        public void hideTarget() {
@@ -620,7 +627,8 @@ public class SlidingTab extends ViewGroup { 


    void startAnimating(final boolean holdAfter) {

        mAnimating = true;

        final Animation trans;

        final Animation trans1;

        final Animation trans2;

        final Slider slider = mCurrentSlider;

        final Slider other = mOtherSlider;

        final int dx;
@@ -644,12 +652,16 @@ public class SlidingTab extends ViewGroup { 
            dy =  slider == mRightSlider ? (top + viewHeight - holdOffset)

                    : - ((viewHeight - bottom) + viewHeight - holdOffset);

        }

        trans = new TranslateAnimation(0, dx, 0, dy);

        trans.setDuration(ANIM_DURATION);

        trans.setInterpolator(new LinearInterpolator());

        trans.setFillAfter(true);

        trans1 = new TranslateAnimation(0, dx, 0, dy);

        trans1.setDuration(ANIM_DURATION);

        trans1.setInterpolator(new LinearInterpolator());

        trans1.setFillAfter(true);

        trans2 = new TranslateAnimation(0, dx, 0, dy);

        trans2.setDuration(ANIM_DURATION);

        trans2.setInterpolator(new LinearInterpolator());

        trans2.setFillAfter(true);



        trans.setAnimationListener(new AnimationListener() {

        trans1.setAnimationListener(new AnimationListener() {

            public void onAnimationEnd(Animation animation) {

                Animation anim;

                if (holdAfter) {
@@ -662,8 +674,10 @@ public class SlidingTab extends ViewGroup { 
                    resetView();

                }

                anim.setAnimationListener(mAnimationDoneListener);

                mLeftSlider.startAnimation(anim);

                mRightSlider.startAnimation(anim);

                

                /* Animation can be the same for these since the animation just holds */

                mLeftSlider.startAnimation(anim, anim);

                mRightSlider.startAnimation(anim, anim);

            }



            public void onAnimationRepeat(Animation animation) {
@@ -677,7 +691,7 @@ public class SlidingTab extends ViewGroup { 
        });



        slider.hideTarget();

        slider.startAnimation(trans);

        slider.startAnimation(trans1, trans2);

    }



    private void onAnimationDone() {

docs/html/guide/guide_toc.cs

+3 −0
Original line number Diff line number Diff line
@@ -396,6 +396,9 @@ 
          <li><a href="<?cs var:toroot ?>guide/samples/ApiDemos/index.html">

                <span class="en">API Demos</span>

              </a></li>

          <li><a href="<?cs var:toroot ?>guide/samples/BluetoothChat/index.html">

                <span class="en">Bluetooth Chat</span>

              </a></li>

          <li><a href="<?cs var:toroot ?>guide/samples/Home/index.html">

                <span class="en">Home</span>

              </a></li>