Merge branch 'eclair' into eclair-release (e695611b) · Commits · e / os / android_frameworks_base

core/java/android/database/sqlite/SQLiteDatabase.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -286,6 +286,7 @@ public class SQLiteDatabase extends SQLiteClosable {
		close();
		} finally {
		Log.e(TAG, "Removing corrupt database: " + mPath);
		EventLog.writeEvent(EVENT_DB_CORRUPT, mPath);
		// Delete the corrupt file. Don't re-create it now -- that would just confuse people
		// -- but the next time someone tries to open it, they can set it up from scratch.
		new File(mPath).delete();

core/java/android/server/BluetoothA2dpService.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -459,10 +459,6 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub {
		checkSinkSuspendState(state);
		mTargetA2dpState = -1;

		if (state == BluetoothA2dp.STATE_CONNECTING) {
		mAudioManager.setParameters("A2dpSuspended=false");
		}

		if (getSinkPriority(device) > BluetoothA2dp.PRIORITY_OFF &&
		state == BluetoothA2dp.STATE_CONNECTING \|\|
		state == BluetoothA2dp.STATE_CONNECTED) {

core/java/android/webkit/WebView.java

+352 −160

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/webkit/WebViewCore.java

+46 −9

Original line number	Diff line number	Diff line
		@@ -447,8 +447,8 @@ final class WebViewCore {
		should this be called nativeSetViewPortSize?
		*/
		private native void nativeSetSize(int width, int height, int screenWidth,
		float scale, int realScreenWidth, int screenHeight,
		boolean ignoreHeight);
		float scale, int realScreenWidth, int screenHeight, int anchorX,
		int anchorY, boolean ignoreHeight);

		private native int nativeGetContentMinPrefWidth();

		@@ -961,6 +961,7 @@ final class WebViewCore {
		(WebView.ViewSizeData) msg.obj;
		viewSizeChanged(data.mWidth, data.mHeight,
		data.mTextWrapWidth, data.mScale,
		data.mAnchorX, data.mAnchorY,
		data.mIgnoreHeight);
		break;
		}
		@@ -1483,7 +1484,7 @@ final class WebViewCore {

		// notify webkit that our virtual view size changed size (after inv-zoom)
		private void viewSizeChanged(int w, int h, int textwrapWidth, float scale,
		boolean ignoreHeight) {
		int anchorX, int anchorY, boolean ignoreHeight) {
		if (DebugFlags.WEB_VIEW_CORE) {
		Log.v(LOGTAG, "viewSizeChanged w=" + w + "; h=" + h
		+ "; textwrapWidth=" + textwrapWidth + "; scale=" + scale);
		@@ -1514,12 +1515,14 @@ final class WebViewCore {
		width = Math.max(w, Math.max(DEFAULT_VIEWPORT_WIDTH,
		nativeGetContentMinPrefWidth()));
		}
		} else {
		} else if (mViewportWidth > 0) {
		width = Math.max(w, mViewportWidth);
		} else {
		width = Math.max(w, nativeGetContentMinPrefWidth());
		}
		}
		nativeSetSize(width, width == w ? h : Math.round((float) width * h / w),
		textwrapWidth, scale, w, h, ignoreHeight);
		textwrapWidth, scale, w, h, anchorX, anchorY, ignoreHeight);
		// Remember the current width and height
		boolean needInvalidate = (mCurrentViewWidth == 0);
		mCurrentViewWidth = w;
		@@ -1953,14 +1956,12 @@ final class WebViewCore {
		mRestoreState.mScrollY = mRestoredY;
		mRestoreState.mMobileSite = (0 == mViewportWidth);
		if (mRestoredScale > 0) {
		mRestoreState.mViewScale = mRestoredScale / 100.0f;
		if (mRestoredScreenWidthScale > 0) {
		mRestoreState.mTextWrapScale =
		mRestoredScreenWidthScale / 100.0f;
		// 0 will trigger WebView to turn on zoom overview mode
		mRestoreState.mViewScale = 0;
		} else {
		mRestoreState.mViewScale = mRestoreState.mTextWrapScale =
		mRestoredScale / 100.0f;
		mRestoreState.mTextWrapScale = mRestoreState.mViewScale;
		}
		} else {
		if (mViewportInitialScale > 0) {
		@@ -1993,6 +1994,7 @@ final class WebViewCore {
		data.mTextWrapWidth = data.mWidth;
		data.mScale = -1.0f;
		data.mIgnoreHeight = false;
		data.mAnchorX = data.mAnchorY = 0;
		// send VIEW_SIZE_CHANGED to the front of the queue so that we can
		// avoid pushing the wrong picture to the WebView side. If there is
		// a VIEW_SIZE_CHANGED in the queue, probably from WebView side,
		@@ -2021,6 +2023,7 @@ final class WebViewCore {
		data.mTextWrapWidth = Math.round(webViewWidth
		/ mRestoreState.mTextWrapScale);
		data.mIgnoreHeight = false;
		data.mAnchorX = data.mAnchorY = 0;
		// send VIEW_SIZE_CHANGED to the front of the queue so that we
		// can avoid pushing the wrong picture to the WebView side.
		mEventHub.removeMessages(EventHub.VIEW_SIZE_CHANGED);
		@@ -2177,6 +2180,40 @@ final class WebViewCore {
		childView.removeView();
		}

		// called by JNI
		static class ShowRectData {
		int mLeft;
		int mTop;
		int mWidth;
		int mHeight;
		int mContentWidth;
		int mContentHeight;
		float mXPercentInDoc;
		float mXPercentInView;
		float mYPercentInDoc;
		float mYPercentInView;
		}

		private void showRect(int left, int top, int width, int height,
		int contentWidth, int contentHeight, float xPercentInDoc,
		float xPercentInView, float yPercentInDoc, float yPercentInView) {
		if (mWebView != null) {
		ShowRectData data = new ShowRectData();
		data.mLeft = left;
		data.mTop = top;
		data.mWidth = width;
		data.mHeight = height;
		data.mContentWidth = contentWidth;
		data.mContentHeight = contentHeight;
		data.mXPercentInDoc = xPercentInDoc;
		data.mXPercentInView = xPercentInView;
		data.mYPercentInDoc = yPercentInDoc;
		data.mYPercentInView = yPercentInView;
		Message.obtain(mWebView.mPrivateHandler, WebView.SHOW_RECT_MSG_ID,
		data).sendToTarget();
		}
		}

		private native void nativePause();
		private native void nativeResume();
		private native void nativeFreeMemory();

core/java/android/widget/ImageButton.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -44,11 +44,11 @@ import java.util.Map;
		* <pre>
		* <?xml version="1.0" encoding="utf-8"?>
		* <selector xmlns:android="http://schemas.android.com/apk/res/android">
		* <item android:drawable="@drawable/button_normal" /> <!-- default -->
		* <item android:state_pressed="true"
		* android:drawable="@drawable/button_pressed" /> <!-- pressed -->
		* <item android:state_focused="true"
		* android:drawable="@drawable/button_focused" /> <!-- focused -->
		* <item android:drawable="@drawable/button_normal" /> <!-- default -->
		* </selector></pre>
		*
		* <p>Save the XML file in your project {@code res/drawable/} folder and then
		@@ -57,6 +57,11 @@ import java.util.Map;
		* based on the state of the button and the corresponding images
		* defined in the XML.</p>
		*
		* <p>The order of the {@code <item>} elements is important because they are
		* evaluated in order. This is why the "normal" button image comes last, because
		* it will only be applied after {@code android:state_pressed} and {@code
		* android:state_focused} have both evaluated false.</p>
		*
		* <p><strong>XML attributes</strong></p>
		* <p>
		* See {@link android.R.styleable#ImageView Button Attributes},