Merge branch 'froyo' into froyo-release (40fca6ae) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -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

+4 −4

Original line number	Diff line number	Diff line
		@@ -2645,7 +2645,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		mScrollDuration);

		mLastSeenPos = lastPos;
		if (lastPos != mTargetPos) {
		if (lastPos < mTargetPos) {
		post(this);
		}
		break;
		@@ -2671,7 +2671,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> 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<ListAdapter> implements Te

		mLastSeenPos = firstPos;

		if (firstPos != mTargetPos) {
		if (firstPos > mTargetPos) {
		post(this);
		}
		break;
		@@ -2728,7 +2728,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> 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 {

+2 −3

Original line number	Diff line number	Diff line
		@@ -14,9 +14,8 @@ home=true
		<img src="{@docRoot}images/home/io-logo.png" alt="Google IO
		2010" width="200" height="41" style="padding:22px 12px;"/>
		<div id="announcement" style="width:295px">
		<p>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.</p><p><a
		<p>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.</p><p><a
		href="http://code.google.com/events/io/2010/sessions.html#Android">Learn more »</a></p>
		</div> <!-- end annoucement -->
		</div> <!-- end annoucement-block -->

+2 −2

Original line number	Diff line number	Diff line
		@@ -299,7 +299,7 @@ programmatically-constructed example:</p>

		<pre><?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"/></pre>
		@@ -410,7 +410,7 @@ the following XML:

		<pre><?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"/></pre>

+1 −1

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@ padding: .25em 1em;
		<div class="toggleable opened">
		<a href="#" onclick="return toggleDiv(this)">
		<img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px" width="9px" />
		ADT 0.9.6</a> <em>(March 2010)</em>
		ADT 0.9.7</a> <em>(May 2010)</em>
		<div class="toggleme">

		<dl>