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

Android.mk

+19 −20

Original line number	Diff line number	Diff line
		@@ -334,6 +334,7 @@ framework_docs_LOCAL_INTERMEDIATE_SOURCES := \
		framework_docs_LOCAL_JAVA_LIBRARIES := \
		core \
		ext \
		framework \

		framework_docs_LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		framework_docs_LOCAL_DROIDDOC_HTML_DIR := docs/html
		@@ -356,33 +357,31 @@ sample_dir := development/samples
		web_docs_sample_code_flags := \
		-hdf android.hasSamples 1 \
		-samplecode $(sample_dir)/ApiDemos \
		guide/samples/ApiDemos "API Demos" \
		resources/samples/ApiDemos "API Demos" \
		-samplecode $(sample_dir)/BluetoothChat \
		guide/samples/BluetoothChat "Bluetooth Chat" \
		resources/samples/BluetoothChat "Bluetooth Chat" \
		-samplecode $(sample_dir)/ContactManager \
		guide/samples/ContactManager "Contact Manager" \
		resources/samples/ContactManager "Contact Manager" \
		-samplecode $(sample_dir)/Home \
		guide/samples/Home "Home" \
		resources/samples/Home "Home" \
		-samplecode $(sample_dir)/JetBoy \
		guide/samples/JetBoy "JetBoy" \
		resources/samples/JetBoy "JetBoy" \
		-samplecode $(sample_dir)/LunarLander \
		guide/samples/LunarLander "Lunar Lander" \
		resources/samples/LunarLander "Lunar Lander" \
		-samplecode $(sample_dir)/MultiResolution \
		guide/samples/MultiResolution "Multiple Resolutions" \
		resources/samples/MultiResolution "Multiple Resolutions" \
		-samplecode $(sample_dir)/NotePad \
		guide/samples/NotePad "Note Pad" \
		resources/samples/NotePad "Note Pad" \
		-samplecode $(sample_dir)/SearchableDictionary \
		guide/samples/SearchableDictionary "Searchable Dictionary" \
		resources/samples/SearchableDictionary "Searchable Dictionary" \
		-samplecode $(sample_dir)/Snake \
		guide/samples/Snake "Snake" \
		resources/samples/Snake "Snake" \
		-samplecode $(sample_dir)/SoftKeyboard \
		guide/samples/SoftKeyboard "Soft Keyboard" \
		resources/samples/SoftKeyboard "Soft Keyboard" \
		-samplecode $(sample_dir)/Wiktionary \
		guide/samples/Wiktionary "Wiktionary" \
		resources/samples/Wiktionary "Wiktionary" \
		-samplecode $(sample_dir)/WiktionarySimple \
		guide/samples/WiktionarySimple "Wiktionary (Simplified)"


		resources/samples/WiktionarySimple "Wiktionary (Simplified)"

		## SDK version identifiers used in the published docs
		# major[.minor] version for current SDK. (full releases only)

core/java/android/app/ActivityThread.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -1383,13 +1383,14 @@ public final class ActivityThread {

		public final void scheduleRelaunchActivity(IBinder token,
		List<ResultInfo> pendingResults, List<Intent> pendingNewIntents,
		int configChanges, boolean notResumed) {
		int configChanges, boolean notResumed, Configuration config) {
		ActivityRecord r = new ActivityRecord();

		r.token = token;
		r.pendingResults = pendingResults;
		r.pendingIntents = pendingNewIntents;
		r.startsNotResumed = notResumed;
		r.createdConfig = config;

		synchronized (mRelaunchingActivities) {
		mRelaunchingActivities.add(r);
		@@ -2511,7 +2512,7 @@ public final class ActivityThread {
		Activity a = performLaunchActivity(r, customIntent);

		if (a != null) {
		r.createdConfig = new Configuration(a.getResources().getConfiguration());
		r.createdConfig = new Configuration(mConfiguration);
		handleResumeActivity(r.token, false, r.isForward);

		if (!r.activity.mFinished && r.startsNotResumed) {
		@@ -3563,6 +3564,16 @@ public final class ActivityThread {
		}
		}

		if (tmp.createdConfig != null) {
		// If the activity manager is passing us its current config,
		// assume that is really what we want regardless of what we
		// may have pending.
		if (mConfiguration == null
		\|\| mConfiguration.diff(tmp.createdConfig) != 0) {
		changedConfig = tmp.createdConfig;
		}
		}

		if (DEBUG_CONFIGURATION) Log.v(TAG, "Relaunching activity "
		+ tmp.token + ": changedConfig=" + changedConfig);

core/java/android/app/ApplicationThreadNative.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -140,7 +140,11 @@ public abstract class ApplicationThreadNative extends Binder
		List<Intent> pi = data.createTypedArrayList(Intent.CREATOR);
		int configChanges = data.readInt();
		boolean notResumed = data.readInt() != 0;
		scheduleRelaunchActivity(b, ri, pi, configChanges, notResumed);
		Configuration config = null;
		if (data.readInt() != 0) {
		config = Configuration.CREATOR.createFromParcel(data);
		}
		scheduleRelaunchActivity(b, ri, pi, configChanges, notResumed, config);
		return true;
		}

		@@ -491,7 +495,8 @@ class ApplicationThreadProxy implements IApplicationThread {

		public final void scheduleRelaunchActivity(IBinder token,
		List<ResultInfo> pendingResults, List<Intent> pendingNewIntents,
		int configChanges, boolean notResumed) throws RemoteException {
		int configChanges, boolean notResumed, Configuration config)
		throws RemoteException {
		Parcel data = Parcel.obtain();
		data.writeInterfaceToken(IApplicationThread.descriptor);
		data.writeStrongBinder(token);
		@@ -499,6 +504,12 @@ class ApplicationThreadProxy implements IApplicationThread {
		data.writeTypedList(pendingNewIntents);
		data.writeInt(configChanges);
		data.writeInt(notResumed ? 1 : 0);
		if (config != null) {
		data.writeInt(1);
		config.writeToParcel(data, 0);
		} else {
		data.writeInt(0);
		}
		mRemote.transact(SCHEDULE_RELAUNCH_ACTIVITY_TRANSACTION, data, null,
		IBinder.FLAG_ONEWAY);
		data.recycle();

core/java/android/app/IApplicationThread.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ public interface IApplicationThread extends IInterface {
		throws RemoteException;
		void scheduleRelaunchActivity(IBinder token, List<ResultInfo> pendingResults,
		List<Intent> pendingNewIntents, int configChanges,
		boolean notResumed) throws RemoteException;
		boolean notResumed, Configuration config) throws RemoteException;
		void scheduleNewIntent(List<Intent> intent, IBinder token) throws RemoteException;
		void scheduleDestroyActivity(IBinder token, boolean finished,
		int configChanges) throws RemoteException;

core/java/android/widget/TextView.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -4531,6 +4531,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		// Now use the delta to determine the actual amount of text
		// we need.
		partialEndOffset += delta;
		if (partialStartOffset > N) {
		partialStartOffset = N;
		} else if (partialStartOffset < 0) {
		partialStartOffset = 0;
		}
		if (partialEndOffset > N) {
		partialEndOffset = N;
		} else if (partialEndOffset < 0) {