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

api/current.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -976,7 +976,7 @@
		value=""android.permission.SET_PREFERRED_APPLICATIONS""
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -41097,7 +41097,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="packageName" type="java.lang.String">
		@@ -41850,7 +41850,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="packageName" type="java.lang.String">

core/java/android/content/pm/PackageManager.java

+8 −10

Original line number	Diff line number	Diff line
		@@ -1656,21 +1656,19 @@ public abstract class PackageManager {
		IPackageStatsObserver observer);

		/**
		* Add a new package to the list of preferred packages. This new package
		* will be added to the front of the list (removed from its current location
		* if already listed), meaning it will now be preferred over all other
		* packages when resolving conflicts.
		*
		* @param packageName The package name of the new package to make preferred.
		* @deprecated This function no longer does anything; it was an old
		* approach to managing preferred activities, which has been superceeded
		* (and conflicts with) the modern activity-based preferences.
		*/
		@Deprecated
		public abstract void addPackageToPreferred(String packageName);

		/**
		* Remove a package from the list of preferred packages. If it was on
		* the list, it will no longer be preferred over other packages.
		*
		* @param packageName The package name to remove.
		* @deprecated This function no longer does anything; it was an old
		* approach to managing preferred activities, which has been superceeded
		* (and conflicts with) the modern activity-based preferences.
		*/
		@Deprecated
		public abstract void removePackageFromPreferred(String packageName);

		/**

core/java/android/webkit/WebView.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -4621,6 +4621,7 @@ public class WebView extends AbsoluteLayout
		View v = mWebTextView;
		int x = viewToContentX((v.getLeft() + v.getRight()) >> 1);
		int y = viewToContentY((v.getTop() + v.getBottom()) >> 1);
		displaySoftKeyboard(true);
		nativeTextInputMotionUp(x, y);
		}
		}

core/res/AndroidManifest.xml

+3 −5

Original line number	Diff line number	Diff line
		@@ -597,11 +597,9 @@
		android:label="@string/permlab_getPackageSize"
		android:description="@string/permdesc_getPackageSize" />

		<!-- Allows an application to modify the list of preferred applications
		with the {@link android.content.pm.PackageManager#addPackageToPreferred
		PackageManager.addPackageToPreferred()} and
		{@link android.content.pm.PackageManager#removePackageFromPreferred
		PackageManager.removePackageFromPreferred()} methods. -->
		<!-- @deprecated No longer useful, see
		{@link android.content.pm.PackageManager#addPackageToPreferred}
		for details. -->
		<permission android:name="android.permission.SET_PREFERRED_APPLICATIONS"
		android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
		android:protectionLevel="dangerous"

docs/html/guide/appendix/api-levels.jd

+11 −6

Original line number	Diff line number	Diff line
		@@ -123,7 +123,9 @@ application to use manifest elements or behaviors defined in the target
		API Level, rather than being restricted to using only those defined
		for the minimum API Level.</li>
		<li><code>android:maxSdkVersion</code> — Specifies the maximum API Level
		on which the application is able to run.</li>
		on which the application is able to run. <strong>Important:</strong> Please read the <a
		href="{@docRoot}guide/topics/manifest/uses-sdk-element.html"><code><uses-sdk></code></a>
		documentation before using this attribute. </li>
		</ul>

		<p>For example, to specify the minimum system API Level that an application
		@@ -133,10 +135,11 @@ attribute. The value of <code>android:minSdkVersion</code> would be the integer
		corresponding to the API Level of the earliest version of the Android platform
		under which the application can run. </p>

		<p>When the user attempts to install an application, the Android system first
		checks the <code><uses-sdk></code> attributes in the application's
		manifest and compares them against its own internal API Level. The system
		allows the installation to begin only if these conditions are met:</p>
		<p>When the user attempts to install an application, or when revalidating an
		appplication after a system update, the Android system first checks the
		<code><uses-sdk></code> attributes in the application's manifest and
		compares the values against its own internal API Level. The system allows the
		installation to begin only if these conditions are met:</p>

		<ul>
		<li>If a <code>android:minSdkVersion</code> attribute is declared, its value
		@@ -145,7 +148,9 @@ the system assumes that the application requires API Level 1. </li>
		<li>If a <code>android:maxSdkVersion</code> attribute is declared, its value
		must be equal to or greater than the system's API Level integer.
		If not declared, the system assumes that the application
		has no maximum API Level. </li>
		has no maximum API Level. Please read the <a
		href="{@docRoot}guide/topics/manifest/uses-sdk-element.html"><code><uses-sdk></code></a>
		documentation for more information about how the system handles this attribute.</li>
		</ul>

		<p>When declared in an application's manifest, a <code><uses-sdk></code>