Merge branch 'gingerbread' into gingerbread-release (96c58e59) · Commits · e / os / android_frameworks_base

api/current.xml

+12 −12

Original line number	Diff line number	Diff line
		@@ -224570,7 +224570,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="t" type="T">
		<parameter name="arg0" type="T">
		</parameter>
		</method>
		</interface>
		@@ -326643,7 +326643,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="toCopyIn" type="E[]">
		<parameter name="array" type="E[]">
		</parameter>
		</constructor>
		<method name="add"
		@@ -326671,7 +326671,7 @@
		>
		<parameter name="index" type="int">
		</parameter>
		<parameter name="element" type="E">
		<parameter name="e" type="E">
		</parameter>
		</method>
		<method name="addAll"
		@@ -326799,7 +326799,9 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="o" type="java.lang.Object">
		<parameter name="e" type="E">
		</parameter>
		<parameter name="index" type="int">
		</parameter>
		</method>
		<method name="indexOf"
		@@ -326812,9 +326814,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="e" type="E">
		</parameter>
		<parameter name="index" type="int">
		<parameter name="o" type="java.lang.Object">
		</parameter>
		</method>
		<method name="isEmpty"
		@@ -326849,7 +326849,9 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="o" type="java.lang.Object">
		<parameter name="e" type="E">
		</parameter>
		<parameter name="index" type="int">
		</parameter>
		</method>
		<method name="lastIndexOf"
		@@ -326862,9 +326864,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="e" type="E">
		</parameter>
		<parameter name="index" type="int">
		<parameter name="o" type="java.lang.Object">
		</parameter>
		</method>
		<method name="listIterator"
		@@ -326955,7 +326955,7 @@
		>
		<parameter name="index" type="int">
		</parameter>
		<parameter name="element" type="E">
		<parameter name="e" type="E">
		</parameter>
		</method>
		<method name="size"

core/java/android/app/Application.java

+12 −6

Original line number	Diff line number	Diff line
		@@ -27,6 +27,14 @@ import android.content.res.Configuration;
		* AndroidManifest.xml's <application> tag, which will cause that class
		* to be instantiated for you when the process for your application/package is
		* created.
		*
		* <p class="note">There is normally no need to subclass Application. In
		* most situation, static singletons can provide the same functionality in a
		* more modular way. If your singleton needs a global context (for example
		* to register broadcast receivers), the function to retrieve it can be
		* given a {@link android.content.Context} which internally uses
		* {@link android.content.Context#getApplicationContext() Context.getApplicationContext()}
		* when first constructing the singleton.</p>
		*/
		public class Application extends ContextWrapper implements ComponentCallbacks {

		@@ -46,12 +54,10 @@ public class Application extends ContextWrapper implements ComponentCallbacks {
		}

		/**
		* Called when the application is stopping. There are no more application
		* objects running and the process will exit. <em>Note: never depend on
		* this method being called; in many cases an unneeded application process
		* will simply be killed by the kernel without executing any application
		* code.</em>
		* If you override this method, be sure to call super.onTerminate().
		* This method is for use in emulated process environments. It will
		* never be called on a production Android device, where processes are
		* removed by simply killing them; no user code (including this callback)
		* is executed when doing so.
		*/
		public void onTerminate() {
		}

core/java/android/webkit/WebTextView.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -334,6 +334,10 @@ import java.util.ArrayList;
		}
		}

		public void onDrawSubstitute() {
		updateCursorControllerPositions();
		}

		@Override
		public void onEditorAction(int actionCode) {
		switch (actionCode) {

core/java/android/webkit/WebView.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -3531,6 +3531,9 @@ public class WebView extends AbsoluteLayout
		if (AUTO_REDRAW_HACK && mAutoRedraw) {
		invalidate();
		}
		if (inEditingMode()) {
		mWebTextView.onDrawSubstitute();
		}
		mWebViewCore.signalRepaintDone();
		}

core/java/android/widget/TextView.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -4162,6 +4162,15 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener

		canvas.restore();

		updateCursorControllerPositions();
		}

		/**
		* Update the positions of the CursorControllers. Needed by WebTextView,
		* which does not draw.
		* @hide
		*/
		protected void updateCursorControllerPositions() {
		if (mInsertionPointCursorController != null &&
		mInsertionPointCursorController.isShowing()) {
		mInsertionPointCursorController.updatePosition();