Merge branch 'eclair' of git://android.git.kernel.org/platform/frameworks/base into eclair (fabfe998) · Commits · e / os / android_frameworks_base

Android.mk

+7 −1

Original line number	Diff line number	Diff line
		@@ -355,6 +355,8 @@ framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:=$(call intermediates-dir-for,JAVA_LIBR

		sample_dir := development/samples

		# the list here should match the list of samples included in the sdk samples package
		# (see development/build/sdk.atree)
		web_docs_sample_code_flags := \
		-hdf android.hasSamples 1 \
		-samplecode $(sample_dir)/ApiDemos \
		@@ -365,6 +367,8 @@ web_docs_sample_code_flags := \
		resources/samples/BusinessCard "Business Card" \
		-samplecode $(sample_dir)/ContactManager \
		resources/samples/ContactManager "Contact Manager" \
		-samplecode $(sample_dir)/CubeLiveWallpaper \
		resources/samples/CubeLiveWallpaper "Live Wallpaper" \
		-samplecode $(sample_dir)/Home \
		resources/samples/Home "Home" \
		-samplecode $(sample_dir)/JetBoy \
		@@ -375,6 +379,8 @@ web_docs_sample_code_flags := \
		resources/samples/MultiResolution "Multiple Resolutions" \
		-samplecode $(sample_dir)/NotePad \
		resources/samples/NotePad "Note Pad" \
		-samplecode $(sample_dir)/SampleSyncAdapter \
		resources/samples/SampleSyncAdapter "Sample Sync Adapter" \
		-samplecode $(sample_dir)/SearchableDictionary \
		resources/samples/SearchableDictionary "Searchable Dictionary" \
		-samplecode $(sample_dir)/Snake \
		@@ -388,7 +394,7 @@ web_docs_sample_code_flags := \

		## SDK version identifiers used in the published docs
		# major[.minor] version for current SDK. (full releases only)
		framework_docs_SDK_VERSION:=2.0.1
		framework_docs_SDK_VERSION:=2.1
		# release version (ie "Release x") (full releases only)
		framework_docs_SDK_REL_ID:=1
		# name of current SDK directory (full releases only)

core/java/android/view/ScaleGestureDetector.java

+8 −10

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package android.view;

		import android.content.Context;
		import android.util.DisplayMetrics;
		import android.util.Log;

		/**
		* Detects transformation gestures involving more than one pointer ("multitouch")
		@@ -45,9 +44,9 @@ public class ScaleGestureDetector {
		*
		* An application will receive events in the following order:
		* <ul>
		* <li>One {@link OnScaleGestureListener#onScaleBegin()}
		* <li>Zero or more {@link OnScaleGestureListener#onScale()}
		* <li>One {@link OnScaleGestureListener#onTransformEnd()}
		* <li>One {@link OnScaleGestureListener#onScaleBegin(ScaleGestureDetector)}
		* <li>Zero or more {@link OnScaleGestureListener#onScale(ScaleGestureDetector)}
		* <li>One {@link OnScaleGestureListener#onScaleEnd(ScaleGestureDetector)}
		* </ul>
		*/
		public interface OnScaleGestureListener {
		@@ -82,8 +81,7 @@ public class ScaleGestureDetector {

		/**
		* Responds to the end of a scale gesture. Reported by existing
		* pointers going up. If the end of a gesture would result in a fling,
		* {@link onTransformFling()} is called instead.
		* pointers going up.
		*
		* Once a scale has ended, {@link ScaleGestureDetector#getFocusX()}
		* and {@link ScaleGestureDetector#getFocusY()} will return the location
		@@ -103,7 +101,7 @@ public class ScaleGestureDetector {
		* {@link OnScaleGestureListener#onScaleBegin(ScaleGestureDetector)} return
		* {@code true}.
		*/
		public class SimpleOnScaleGestureListener implements OnScaleGestureListener {
		public static class SimpleOnScaleGestureListener implements OnScaleGestureListener {

		public boolean onScale(ScaleGestureDetector detector) {
		return true;
		@@ -373,7 +371,7 @@ public class ScaleGestureDetector {
		* the two pointers forming the gesture.
		* If a gesture is ending, the focal point is the location of the
		* remaining pointer on the screen.
		* If {@link isInProgress()} would return false, the result of this
		* If {@link #isInProgress()} would return false, the result of this
		* function is undefined.
		*
		* @return X coordinate of the focal point in pixels.
		@@ -388,7 +386,7 @@ public class ScaleGestureDetector {
		* the two pointers forming the gesture.
		* If a gesture is ending, the focal point is the location of the
		* remaining pointer on the screen.
		* If {@link isInProgress()} would return false, the result of this
		* If {@link #isInProgress()} would return false, the result of this
		* function is undefined.
		*
		* @return Y coordinate of the focal point in pixels.
		@@ -430,7 +428,7 @@ public class ScaleGestureDetector {
		/**
		* Return the scaling factor from the previous scale event to the current
		* event. This value is defined as
		* ({@link getCurrentSpan()} / {@link getPreviousSpan()}).
		* ({@link #getCurrentSpan()} / {@link #getPreviousSpan()}).
		*
		* @return The current scaling factor.
		*/

core/java/android/webkit/WebView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -434,7 +434,7 @@ public class WebView extends AbsoluteLayout
		private boolean mWrapContent;

		// whether support multi-touch
		private static boolean mSupportMultiTouch;
		private boolean mSupportMultiTouch;
		// use the framework's ScaleGestureDetector to handle multi-touch
		private ScaleGestureDetector mScaleDetector;
		// minimum scale change during multi-touch zoom

core/java/android/webkit/WebViewDatabase.java

+21 −3

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.content.Context;
		import android.database.Cursor;
		import android.database.DatabaseUtils;
		import android.database.sqlite.SQLiteDatabase;
		import android.database.sqlite.SQLiteException;
		import android.database.sqlite.SQLiteStatement;
		import android.util.Log;
		import android.webkit.CookieManager.Cookie;
		@@ -174,7 +175,16 @@ public class WebViewDatabase {
		public static synchronized WebViewDatabase getInstance(Context context) {
		if (mInstance == null) {
		mInstance = new WebViewDatabase();
		mDatabase = context.openOrCreateDatabase(DATABASE_FILE, 0, null);
		try {
		mDatabase = context
		.openOrCreateDatabase(DATABASE_FILE, 0, null);
		} catch (SQLiteException e) {
		// try again by deleting the old db and create a new one
		if (context.deleteDatabase(DATABASE_FILE)) {
		mDatabase = context.openOrCreateDatabase(DATABASE_FILE, 0,
		null);
		}
		}

		// mDatabase should not be null,
		// the only case is RequestAPI test has problem to create db
		@@ -194,8 +204,16 @@ public class WebViewDatabase {
		mDatabase.setLockingEnabled(false);
		}

		mCacheDatabase = context.openOrCreateDatabase(CACHE_DATABASE_FILE,
		0, null);
		try {
		mCacheDatabase = context.openOrCreateDatabase(
		CACHE_DATABASE_FILE, 0, null);
		} catch (SQLiteException e) {
		// try again by deleting the old db and create a new one
		if (context.deleteDatabase(CACHE_DATABASE_FILE)) {
		mCacheDatabase = context.openOrCreateDatabase(
		CACHE_DATABASE_FILE, 0, null);
		}
		}

		// mCacheDatabase should not be null,
		// the only case is RequestAPI test has problem to create db

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

+12 −2

Original line number	Diff line number	Diff line
		@@ -548,12 +548,22 @@ public class SlidingTab extends ViewGroup {
		return true;
		}

		/**
		* Reset the tabs to their original state and stop any existing animation.
		* Animate them back into place if animate is true.
		*
		* @param animate
		*/
		public void reset(boolean animate) {
		mLeftSlider.reset(animate);
		mRightSlider.reset(animate);
		}

		@Override
		public void setVisibility(int visibility) {
		// Clear animations so sliders don't continue to animate when we show the widget again.
		if (visibility != getVisibility() && visibility == View.INVISIBLE) {
		mLeftSlider.reset(false);
		mRightSlider.reset(false);
		reset(false);
		}
		super.setVisibility(visibility);
		}