diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index e8c09b0d9f9ec..9f19f119f827a 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3332,6 +3332,14 @@ public final class Settings { */ public static final String THROTTLE_HELP_URI = "throttle_help_uri"; + /** + * The length of time in Sec that we allow our notion of NTP time + * to be cached before we refresh it + * @hide + */ + public static final String THROTTLE_MAX_NTP_CACHE_AGE_SEC = + "throttle_max_ntp_cache_age_sec"; + /** * @hide diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 48e7f79d38e41..fcfecb30ca70f 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -2645,7 +2645,7 @@ public abstract class AbsListView extends AdapterView implements Te mScrollDuration); mLastSeenPos = lastPos; - if (lastPos != mTargetPos) { + if (lastPos < mTargetPos) { post(this); } break; @@ -2671,7 +2671,7 @@ public abstract class AbsListView extends AdapterView implements Te final int nextViewHeight = nextView.getHeight(); final int nextViewTop = nextView.getTop(); final int extraScroll = mExtraScroll; - if (nextPos != mBoundPos) { + if (nextPos < mBoundPos) { smoothScrollBy(Math.max(0, nextViewHeight + nextViewTop - extraScroll), mScrollDuration); @@ -2704,7 +2704,7 @@ public abstract class AbsListView extends AdapterView implements Te mLastSeenPos = firstPos; - if (firstPos != mTargetPos) { + if (firstPos > mTargetPos) { post(this); } break; @@ -2728,7 +2728,7 @@ public abstract class AbsListView extends AdapterView implements Te final int lastViewTop = lastView.getTop(); final int lastViewPixelsShowing = listHeight - lastViewTop; mLastSeenPos = lastPos; - if (lastPos != mBoundPos) { + if (lastPos > mBoundPos) { smoothScrollBy(-(lastViewPixelsShowing - mExtraScroll), mScrollDuration); post(this); } else { diff --git a/docs/html/index.jd b/docs/html/index.jd index 0ba5e08184b17..01940e82b31bf 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -14,9 +14,8 @@ home=true Google IO 2010
-

Google I/O is happening now! To those of you with us, welcome! If you couldn't make it to the -event, stay tuned for videos and slides from the Android sessions, which will be posted at the -Google I/O web site.

Thanks to everyone who visited us at Google I/O in San Francisco! Stay tuned for +videos and slides from the Android sessions, which will be posted at the Google I/O web site.

Learn more »

diff --git a/docs/html/resources/tutorials/hello-world.jd b/docs/html/resources/tutorials/hello-world.jd index 7bad0541114aa..77ffc6f46b9f2 100644 --- a/docs/html/resources/tutorials/hello-world.jd +++ b/docs/html/resources/tutorials/hello-world.jd @@ -299,7 +299,7 @@ programmatically-constructed example:

<?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@id+/textview"
+  android:id="@+id/textview"
   android:layout_width="fill_parent"
   android:layout_height="fill_parent"
   android:text="@string/hello"/>
@@ -410,7 +410,7 @@ the following XML: 
<?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@id+/textview"
+  android:id="@+id/textview"
   android:layout_width="fill_parent"
   android:layout_height="fill_parent"
   android:text="@string/hello"/>
diff --git a/docs/html/sdk/eclipse-adt.jd b/docs/html/sdk/eclipse-adt.jd index 57eac1f0320ce..f5558ab831a68 100644 --- a/docs/html/sdk/eclipse-adt.jd +++ b/docs/html/sdk/eclipse-adt.jd @@ -95,7 +95,7 @@ padding: .25em 1em;
-ADT 0.9.6 (March 2010) +ADT 0.9.7 (May 2010)
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java index ae9e102c10b45..3e46e27a80aba 100755 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java @@ -16,6 +16,8 @@ package com.android.mediaframeworktest; +import android.media.MediaRecorder; +import android.os.Bundle; import android.test.InstrumentationTestRunner; import android.test.InstrumentationTestSuite; import com.android.mediaframeworktest.stress.MediaRecorderStressTest; @@ -25,6 +27,17 @@ import junit.framework.TestSuite; public class MediaRecorderStressTestRunner extends InstrumentationTestRunner { + // Default recorder settings + public static int mIterations = 100; + public static int mVideoEncoder = MediaRecorder.VideoEncoder.H263; + public static int mAudioEncdoer = MediaRecorder.AudioEncoder.AMR_NB; + public static int mFrameRate = 20; + public static int mVideoWidth = 352; + public static int mVideoHeight = 288; + public static int mBitRate = 100; + public static boolean mRemoveVideo = true; + public static int mDuration = 10000; + @Override public TestSuite getAllTests() { TestSuite suite = new InstrumentationTestSuite(this); @@ -37,4 +50,50 @@ public class MediaRecorderStressTestRunner extends InstrumentationTestRunner { public ClassLoader getLoader() { return MediaRecorderStressTestRunner.class.getClassLoader(); } + + @Override + public void onCreate(Bundle icicle) { + super.onCreate(icicle); + String iterations = (String) icicle.get("iterations"); + String video_encoder = (String) icicle.get("video_encoder"); + String audio_encoder = (String) icicle.get("audio_encoder"); + String frame_rate = (String) icicle.get("frame_rate"); + String video_width = (String) icicle.get("video_width"); + String video_height = (String) icicle.get("video_height"); + String bit_rate = (String) icicle.get("bit_rate"); + String record_duration = (String) icicle.get("record_duration"); + String remove_videos = (String) icicle.get("remove_videos"); + + if (iterations != null ) { + mIterations = Integer.parseInt(iterations); + } + if ( video_encoder != null) { + mVideoEncoder = Integer.parseInt(video_encoder); + } + if ( audio_encoder != null) { + mAudioEncdoer = Integer.parseInt(audio_encoder); + } + if (frame_rate != null) { + mFrameRate = Integer.parseInt(frame_rate); + } + if (video_width != null) { + mVideoWidth = Integer.parseInt(video_width); + } + if (video_height != null) { + mVideoHeight = Integer.parseInt(video_height); + } + if (bit_rate != null) { + mBitRate = Integer.parseInt(bit_rate); + } + if (record_duration != null) { + mDuration = Integer.parseInt(record_duration); + } + if (remove_videos != null) { + if (remove_videos.compareTo("true") == 0) { + mRemoveVideo = true; + } else { + mRemoveVideo = false; + } + } + } } diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java index 265228155c3f0..a0ef90532cd10 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java @@ -237,18 +237,20 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase