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

core/java/android/annotation/SdkConstant.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,7 @@ import java.lang.annotation.RetentionPolicy;
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	public @interface SdkConstant {		public @interface SdkConstant {
	public static enum SdkConstantType {		public static enum SdkConstantType {
	ACTIVITY_INTENT_ACTION, BROADCAST_INTENT_ACTION, SERVICE_ACTION, INTENT_CATEGORY;		ACTIVITY_INTENT_ACTION, BROADCAST_INTENT_ACTION, SERVICE_ACTION, INTENT_CATEGORY, FEATURE;
	}		}

	SdkConstantType value();		SdkConstantType value();

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

+12 −0

docs/html/guide/appendix/faq/troubleshooting.jd

100644 → 100755

+78 −4

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,10 @@ parent.link=index.html
	<li><a href="#eclipse">Eclipse isn't talking to the emulator</a></li>		<li><a href="#eclipse">Eclipse isn't talking to the emulator</a></li>
	<li><a href="#majorminor">When I go to preferences in Eclipse and select "Android", I get the following error message: Unsupported major.minor version 49.0.</a></li>		<li><a href="#majorminor">When I go to preferences in Eclipse and select "Android", I get the following error message: Unsupported major.minor version 49.0.</a></li>
	<li><a href="#apidemosreinstall">I can't install ApiDemos apps in my IDE because of a signing error</a></li>		<li><a href="#apidemosreinstall">I can't install ApiDemos apps in my IDE because of a signing error</a></li>
			<li><a href="#gesturebuilderinstall">I can't install the GestureBuilder sample
			app in the emulator</a></li>
	<li><a href="#signingcalendar">I can't compile my app because the build tools generated an expired debug certificate</a></li>		<li><a href="#signingcalendar">I can't compile my app because the build tools generated an expired debug certificate</a></li>
			<li><a href="#manifestfiles">Unable to view manifest files from within Eclipse</a></li>
	</ul>		</ul>

	<a name="installeclipsecomponents" id="installeclipsecomponents"></a><h2>ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui".</h2>		<a name="installeclipsecomponents" id="installeclipsecomponents"></a><h2>ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui".</h2>
	@@ -201,17 +204,17 @@ compiled and signed with a private key.</p>

	If you want to modify or run one of the ApiDemos apps from Eclipse/ADT or other IDE, you can do so		If you want to modify or run one of the ApiDemos apps from Eclipse/ADT or other IDE, you can do so
	so only after you uninstall the <em>preinstalled</em> version of the app from the emulator. If		so only after you uninstall the <em>preinstalled</em> version of the app from the emulator. If
	you try to run an ApiDemos apps from your IDE without removing the preinstalled version first,		you try to run an ApiDemos app from your IDE without removing the preinstalled version first,
	you will get errors similar to: </p>		you will get errors similar to these: </p>

	<pre>[2008-08-13 15:14:15 - ApiDemos] Re-installation failed due to different application signatures.		<pre>[2008-08-13 15:14:15 - ApiDemos] Re-installation failed due to different application signatures.
	[2008-08-13 15:14:15 - ApiDemos] You must perform a full uninstall of the application. WARNING: ...This will remove the application data!		[2008-08-13 15:14:15 - ApiDemos] You must perform a full uninstall of the application. WARNING: ...This will remove the application data!
	[2008-08-13 15:14:15 - ApiDemos] Please execute 'adb uninstall com.android.samples' in a shell.</pre>		[2008-08-13 15:14:15 - ApiDemos] Please execute 'adb uninstall com.android.samples' in a shell.</pre>

	<p>The error occurs because, in this case, you are attempting to install another copy of ApiDemos		<p>The error occurs because, in this case, you are attempting to install another copy of ApiDemos
	onto the emulator, a copy that is signed with a different certificate (the Android IDE tools will		onto the emulator, a copy that is signed with a different certificate. (The Android IDE tools will
	have signed the app with a debug certificate, where the existing version was already signed with		have signed the app with a debug certificate, where the existing version was already signed with
	a private certificate). The system does not allow this type of reinstallation. </p>		a private certificate.) The system does not allow this type of reinstallation. </p>

	<p>To resolve the issue, you need to fully uninstall the preinstalled and then reinstall it using		<p>To resolve the issue, you need to fully uninstall the preinstalled and then reinstall it using
	the adb tool. Here's how to do that:</p>		the adb tool. Here's how to do that:</p>
	@@ -233,6 +236,55 @@ commands to the emulator instance that you are targeting. To do that you can add
	<p>For more information about adb, see the <a href="{@docRoot}guide/developing/tools/adb.html">Android Debug Bridge</a>		<p>For more information about adb, see the <a href="{@docRoot}guide/developing/tools/adb.html">Android Debug Bridge</a>
	documentation.</p>		documentation.</p>

			<h2 id="gesturebuilderinstall">I can't install the GestureBuilder sample
			app in the emulator</a></h2>

			<p>This is similar to the ApiDemos problem described above, except that
			you cannot fix it by uninstalling GestureBuilder from the emulator. The
			GestureBuilder app cannot be uninstalled because it is currently installed
			within the system files themselves.</p>

			<p><strong>Symptoms</strong></p>

			<ul><li><p>You cannot run GestureBuilder in the emulator:</p>

			<pre>[2009-12-10 14:57:19 - GestureBuilderActivity]Re-installation failed due to different application signatures.
			[2009-12-10 14:57:19 - GestureBuilderActivity]You must perform a full uninstall of the application. WARNING: This will remove the application data!
			[2009-12-10 14:57:19 - GestureBuilderActivity]Please execute 'adb uninstall com.android.gesture.builder' in a shell.</pre>
			</li>

			<li><p>Running <code>adb uninstall com.android.gesture.builder</code> fails:</p>
			<pre>$ adb uninstall com.android.gesture.builder
			Failure</pre>
			</li></ul>

			<p>For now, the work-around is to change the sample's package name
			so that the system can install it as a new app rather than as a
			replacement for the existing GestureBuilder app. To change the
			package name, open the manifest file and modify the package attribute
			of the manifest element. Next, update imports and other references to
			the package name, rebuild the app, and run it in an AVD.</p>

			<p>For example, here's how you could do this in Eclipse:</p>

			<ol>
			<li>Right-click on the package name
			(<code>src/com.android.gesture.builder</code>).</li>
			<li>Select <strong>Refactor > Rename</strong> and change the name, for example to
			<code>com.android.gestureNEW.builder</code>. </li>
			<li>Open the manifest file. Inside the <code><manifest></code>
			tag, change the package name to
			<code>com.android.gestureNEW.builder</code>.</li>
			<li>Open each of the two Activity files and do Ctrl-Shift-O to add
			missing import packages, then save each file.</li>
			<li>Run the GestureBuilder application on the emulator.</li>
			</ol>

			<p>If you get an error message such as "Could not load /sdcard/gestures.
			Make sure you have a mounted SD card," be sure that your target AVD has an
			SD card. To create an AVD that has an SD card, use the
			<a href="{@docRoot}guide/developing/tools/avd.html#options"><code>-c</code>
			option</a> in the <code>android create avd</code> command.</p>

	<h2 id="signingcalendar">I can't compile my app because the build tools generated an expired debug certificate</h2>		<h2 id="signingcalendar">I can't compile my app because the build tools generated an expired debug certificate</h2>

	@@ -259,3 +311,25 @@ C:\Users\<user>\.android</code></li>
	<p>For general information about signing Android applications, see		<p>For general information about signing Android applications, see
	<a href="{@docRoot}guide/publishing/app-signing.html">Signing Your Applications</a>. </p>		<a href="{@docRoot}guide/publishing/app-signing.html">Signing Your Applications</a>. </p>

			<h2 id="manifestfiles">Unable to view manifest files from within
			Eclipse</a></h2>

			<p>When you try to open an application's manifest file from within
			Eclipse, you might get an error such as this one:</p>
			<pre>An error has occurred. See error log for more details.
			org.eclipse.wst.sse.ui.StructuredTextEditor.isBlockSelectionModeEnabled()Z</pre>

			<p>Try reverting to the 3.0 version of the Eclipse XML Editors and
			Tools. If this does not work, remove the 3.1 version of the tool. To do
			this in Eclipse 3.4:</p>

			<ol>
			<li>Select <strong>Help > Software Updates...</strong></li>
			<li>Select the <strong>Installed Software</strong> tab.</li>
			<li>Select <strong>Eclipse XML Editors and Tools</strong>.</li>
			<li>Click <strong>Uninstall</strong>.</li>
			<li>Click <strong>Finish</strong>.</li>
			</ol>

			<p>When you restart Eclipse, you should be able to view the manifest
			files. </p>

docs/html/guide/topics/manifest/activity-element.jd

+13 −13

Original line number	Original line	Diff line number	Diff line
	@@ -5,10 +5,10 @@ page.title=<activity>
	<dt>syntax:</dt>		<dt>syntax:</dt>
	<dd><pre class="stx"><activity android:<a href="#reparent">allowTaskReparenting</a>=["true" \| "false"]		<dd><pre class="stx"><activity android:<a href="#reparent">allowTaskReparenting</a>=["true" \| "false"]
	android:<a href="#always">alwaysRetainTaskState</a>=["true" \| "false"]		android:<a href="#always">alwaysRetainTaskState</a>=["true" \| "false"]
	android:<a href="#clear">clearTaskOnLaunch</a>=["true"" \| "false"]		android:<a href="#clear">clearTaskOnLaunch</a>=["true" \| "false"]
	android:<a href="#config">configChanges</a>=[<i>one or more of</i>: "mcc" "mnc" "locale"		android:<a href="#config">configChanges</a>=["mcc", "mnc", "locale",
	"touchscreen" "keyboard" "keyboardHidden"		"touchscreen", "keyboard", "keyboardHidden",
	"navigation" "orientation" "fontScale"]		"navigation", "orientation", "fontScale"]
	android:<a href="#enabled">enabled</a>=["true" \| "false"]		android:<a href="#enabled">enabled</a>=["true" \| "false"]
	android:<a href="#exclude">excludeFromRecents</a>=["true" \| "false"]		android:<a href="#exclude">excludeFromRecents</a>=["true" \| "false"]
	android:<a href="#exported">exported</a>=["true" \| "false"]		android:<a href="#exported">exported</a>=["true" \| "false"]
	@@ -24,15 +24,15 @@ page.title=<activity>
	android:<a href="#proc">process</a>="<i>string</i>"		android:<a href="#proc">process</a>="<i>string</i>"
	android:<a href="#screen">screenOrientation</a>=["unspecified" \| "user" \| "behind" \|		android:<a href="#screen">screenOrientation</a>=["unspecified" \| "user" \| "behind" \|
	"landscape" \| "portrait" \|		"landscape" \| "portrait" \|
	"sensor" \| "nonsensor"]		"sensor" \| "nosensor"]
	android:<a href="#state">stateNotNeeded</a>=["true" \| "false"]		android:<a href="#state">stateNotNeeded</a>=["true" \| "false"]
	android:<a href="#aff">taskAffinity</a>="<i>string</i>"		android:<a href="#aff">taskAffinity</a>="<i>string</i>"
	android:<a href="#theme">theme</a>="<i>resource or theme</i>"		android:<a href="#theme">theme</a>="<i>resource or theme</i>"
	android:<a href="#wsoft">windowSoftInputMode</a>=[<i>one or more of</i>: "stateUnspecified"		android:<a href="#wsoft">windowSoftInputMode</a>=["stateUnspecified",
	"stateUnchanged" "stateHidden"		"stateUnchanged", "stateHidden",
	"stateAlwaysHidden" "stateVisible"		"stateAlwaysHidden", "stateVisible",
	"stateAlwaysVisible" "adjustUnspecified"		"stateAlwaysVisible", "adjustUnspecified",
	"adjustResize" "adjustPan"] > <!-- ##api level 3## -->		"adjustResize", "adjustPan"] > <!-- ##api level 3## -->
	. . .		. . .
	</activity></pre></dd>		</activity></pre></dd>

docs/html/guide/topics/manifest/manifest-intro.jd

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -445,7 +445,7 @@ element. For example, an activity could be protected as follows:
	<permission android:name="com.example.project.DEBIT_ACCT" . . . />		<permission android:name="com.example.project.DEBIT_ACCT" . . . />
	. . .		. . .
	<application . . .>		<application . . .>
	<activity android:name="com.example.project.FreneticActivity" . . . >		<activity android:name="com.example.project.FreneticActivity"
	android:permission="com.example.project.DEBIT_ACCT"		android:permission="com.example.project.DEBIT_ACCT"
	. . . >		. . . >
	. . .		. . .

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,8 @@

	package android.content.pm;		package android.content.pm;

			import android.annotation.SdkConstant;
			import android.annotation.SdkConstant.SdkConstantType;
	import android.content.ComponentName;		import android.content.ComponentName;
	import android.content.Context;		import android.content.Context;
	import android.content.Intent;		import android.content.Intent;
	@@ -518,30 +520,35 @@ public abstract class PackageManager {
	* {@link #hasSystemFeature}: The device has a camera facing away		* {@link #hasSystemFeature}: The device has a camera facing away
	* from the screen.		* from the screen.
	*/		*/
			@SdkConstant(SdkConstantType.FEATURE)
	public static final String FEATURE_CAMERA = "android.hardware.camera";		public static final String FEATURE_CAMERA = "android.hardware.camera";

	/**		/**
	* Feature for {@link #getSystemAvailableFeatures} and		* Feature for {@link #getSystemAvailableFeatures} and
	* {@link #hasSystemFeature}: The device's camera supports auto-focus.		* {@link #hasSystemFeature}: The device's camera supports auto-focus.
	*/		*/
			@SdkConstant(SdkConstantType.FEATURE)
	public static final String FEATURE_CAMERA_AUTOFOCUS = "android.hardware.camera.autofocus";		public static final String FEATURE_CAMERA_AUTOFOCUS = "android.hardware.camera.autofocus";

	/**		/**
	* Feature for {@link #getSystemAvailableFeatures} and		* Feature for {@link #getSystemAvailableFeatures} and
	* {@link #hasSystemFeature}: The device's camera supports flash.		* {@link #hasSystemFeature}: The device's camera supports flash.
	*/		*/
			@SdkConstant(SdkConstantType.FEATURE)
	public static final String FEATURE_CAMERA_FLASH = "android.hardware.camera.flash";		public static final String FEATURE_CAMERA_FLASH = "android.hardware.camera.flash";

	/**		/**
	* Feature for {@link #getSystemAvailableFeatures} and		* Feature for {@link #getSystemAvailableFeatures} and
	* {@link #hasSystemFeature}: The device includes a light sensor.		* {@link #hasSystemFeature}: The device includes a light sensor.
	*/		*/
			@SdkConstant(SdkConstantType.FEATURE)
	public static final String FEATURE_SENSOR_LIGHT = "android.hardware.sensor.light";		public static final String FEATURE_SENSOR_LIGHT = "android.hardware.sensor.light";

	/**		/**
	* Feature for {@link #getSystemAvailableFeatures} and		* Feature for {@link #getSystemAvailableFeatures} and
	* {@link #hasSystemFeature}: The device includes a proximity sensor.		* {@link #hasSystemFeature}: The device includes a proximity sensor.