Merge branch 'mnc-mr-docs' into mnc-ub-dev (a5060ee8) · Commits · e / os / android_frameworks_base

Android.mk

+45 −8

Original line number	Diff line number	Diff line
		@@ -948,6 +948,42 @@ $(static_doc_index_redirect): \
		$(full_target): $(static_doc_index_redirect)
		$(full_target): $(framework_built)

		# ==== static html in the sdk, reference only ===============================
		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)
		LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)
		LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)
		LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)
		LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)
		LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)
		LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)
		LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)

		LOCAL_MODULE := offline-refonly

		LOCAL_DROIDDOC_OPTIONS:=\
		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
		-offlinemode \
		-title "Android SDK" \
		-proofread $(OUT_DOCS)/$(LOCAL_MODULE)-proofread.txt \
		-sdkvalues $(OUT_DOCS) \
		-hdf android.whichdoc offline \
		-referenceonly

		LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-refonly

		include $(BUILD_DROIDDOC)

		static_doc_index_redirect := $(out_dir)/index.html
		$(static_doc_index_redirect): \
		$(LOCAL_PATH)/docs/docs-preview-index.html \| $(ACP)
		$(hide) mkdir -p $(dir $@)
		$(hide) $(ACP) $< $@

		$(full_target): $(static_doc_index_redirect)
		$(full_target): $(framework_built)

		# ==== docs for the web (on the androiddevdocs app engine server) =======================
		include $(CLEAR_VARS)

		@@ -1032,41 +1068,42 @@ LOCAL_DROIDDOC_OPTIONS:= \
		-devsite \
		-toroot / \
		-hdf android.whichdoc online \
		-useUpdatedTemplates \
		-hdf devsite true

		LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
		LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev

		include $(BUILD_DROIDDOC)

		# ==== docs for the ndk =======================
		# ==== site updates for docs (on the androiddevdocs app engine server) =======================
		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)
		LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)
		LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES)
		LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)
		LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)
		LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)
		LOCAL_DROIDDOC_HTML_DIR:=docs/html-ndk
		LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)
		LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)
		LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)
		# specify a second html input dir and an output path relative to OUT_DIR)
		LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl/intl /
		LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl /

		LOCAL_MODULE := online-ndk
		LOCAL_MODULE := online-sdk-dev

		LOCAL_DROIDDOC_OPTIONS:= \
		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
		-toroot / \
		-hdf android.whichdoc online \
		$(sample_groups) \
		-useUpdatedTemplates \
		-hdf android.hasSamples true \
		-samplesdir $(samples_dir)

		LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
		LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev

		include $(BUILD_DROIDDOC)


		# ==== docs that have all of the stuff that's @hidden =======================
		include $(CLEAR_VARS)

core/java/android/app/Activity.java

+5 −23

Original line number	Diff line number	Diff line
		@@ -186,7 +186,7 @@ import java.util.List;
		*
		* <p>An activity has essentially four states:</p>
		* <ul>
		* <li> If an activity in the foreground of the screen (at the top of
		* <li> If an activity is in the foreground of the screen (at the top of
		* the stack),
		* it is <em>active</em> or <em>running</em>. </li>
		* <li>If an activity has lost focus but is still visible (that is, a new non-full-sized
		@@ -660,7 +660,7 @@ import java.util.List;
		* independently of the activity lifecycle itself. An example may be a camera
		* application that allows you to upload a picture to a web site. The upload
		* may take a long time, and the application should allow the user to leave
		* the application will it is executing. To accomplish this, your Activity
		* the application while it is executing. To accomplish this, your Activity
		* should start a {@link Service} in which the upload takes place. This allows
		* the system to properly prioritize your process (considering it to be more
		* important than other non-visible applications) for the duration of the
		@@ -3784,28 +3784,10 @@ public class Activity extends ContextThemeWrapper
		* result callbacks including {@link #onRequestPermissionsResult(int, String[], int[])}.
		* </p>
		* <p>
		* A sample permissions request looks like this:
		* The <a href="http://developer.android.com/samples/RuntimePermissions/index.html">
		* RuntimePermissions</a> sample app demonstrates how to use this method to
		* request permissions at run time.
		* </p>
		* <code><pre><p>
		* private void showContacts() {
		* if (checkSelfPermission(Manifest.permission.READ_CONTACTS)
		* != PackageManager.PERMISSION_GRANTED) {
		* requestPermissions(new String[]{Manifest.permission.READ_CONTACTS},
		* PERMISSIONS_REQUEST_READ_CONTACTS);
		* } else {
		* doShowContacts();
		* }
		* }
		*
		* {@literal @}Override
		* public void onRequestPermissionsResult(int requestCode, String[] permissions,
		* int[] grantResults) {
		* if (requestCode == PERMISSIONS_REQUEST_READ_CONTACTS
		* && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
		* showContacts();
		* }
		* }
		* </code></pre></p>
		*
		* @param permissions The requested permissions.
		* @param requestCode Application specific request code to match with a result

core/java/android/appwidget/package.html

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ provide a {@link android.content.BroadcastReceiver} that receives the {@link
		android.appwidget.AppWidgetManager#ACTION_APPWIDGET_UPDATE} intent
		and provide some metadata about the app widget. Android provides the
		{@link android.appwidget.AppWidgetProvider} class, which extends {@link
		android.content.BroadcastReceiver}, as a convenience class to define the app widget behavrio and aid
		android.content.BroadcastReceiver}, as a convenience class to define the app widget behavior and aid
		in handling the broadcasts.</p>

		<p>App widget hosts are the containers in which widgets can be placed. Most of the look and feel

core/java/android/content/Intent.java

+16 −15

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ import java.util.Set;
		* </li>
		* <li> <p><b>{@link #ACTION_VIEW} <i>tel:123</i></b> -- Display
		* the phone dialer with the given number filled in. Note how the
		* VIEW action does what what is considered the most reasonable thing for
		* VIEW action does what is considered the most reasonable thing for
		* a particular URI.</p>
		* </li>
		* <li> <p><b>{@link #ACTION_DIAL} <i>tel:123</i></b> -- Display
		@@ -186,7 +186,7 @@ import java.util.Set;
		*
		* <p>There are a variety of standard Intent action and category constants
		* defined in the Intent class, but applications can also define their own.
		* These strings use java style scoping, to ensure they are unique -- for
		* These strings use Java-style scoping, to ensure they are unique -- for
		* example, the standard {@link #ACTION_VIEW} is called
		* "android.intent.action.VIEW".</p>
		*
		@@ -339,7 +339,7 @@ import java.util.Set;
		* <action android:name="{@link #ACTION_EDIT android.intent.action.EDIT}" />
		* <action android:name="{@link #ACTION_PICK android.intent.action.PICK}" />
		* <category android:name="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" />
		* <data mimeType:name="vnd.android.cursor.dir/<i>vnd.google.note</i>" />
		* <data android:mimeType="vnd.android.cursor.dir/<i>vnd.google.note</i>" />
		* </intent-filter></pre>
		* <p>This declares the things that the activity can do on a directory of
		* notes. The type being supported is given with the <type> tag, where
		@@ -358,7 +358,7 @@ import java.util.Set;
		* <category android:name="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" />
		* <data android:mimeType="vnd.android.cursor.item/<i>vnd.google.note</i>" />
		* </intent-filter></pre>
		* <p>This filter describes the ability return to the caller a note selected by
		* <p>This filter describes the ability to return to the caller a note selected by
		* the user without needing to know where it came from. The data type
		* <code>vnd.android.cursor.item/vnd.google.note</code> is a URI from which
		* a Cursor of exactly one (<code>vnd.android.cursor.item</code>) item can
		@@ -1287,14 +1287,14 @@ public class Intent implements Parcelable, Cloneable {
		"android.intent.extra.ASSIST_INPUT_DEVICE_ID";

		/**
		* Activity Action: List all available applications
		* Activity Action: List all available applications.
		* <p>Input: Nothing.
		* <p>Output: nothing.
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_ALL_APPS = "android.intent.action.ALL_APPS";
		/**
		* Activity Action: Show settings for choosing wallpaper
		* Activity Action: Show settings for choosing wallpaper.
		* <p>Input: Nothing.
		* <p>Output: Nothing.
		*/
		@@ -1902,7 +1902,7 @@ public class Intent implements Parcelable, Cloneable {
		/**
		* Broadcast Action: An existing application package has been removed from
		* the device. The data contains the name of the package. The package
		* that is being installed does <em>not</em> receive this Intent.
		* that is being removed does <em>not</em> receive this Intent.
		* <ul>
		* <li> {@link #EXTRA_UID} containing the integer uid previously assigned
		* to the package.
		@@ -1936,9 +1936,9 @@ public class Intent implements Parcelable, Cloneable {
		public static final String ACTION_PACKAGE_FULLY_REMOVED
		= "android.intent.action.PACKAGE_FULLY_REMOVED";
		/**
		* Broadcast Action: An existing application package has been changed (e.g.
		* a component has been enabled or disabled). The data contains the name of
		* the package.
		* Broadcast Action: An existing application package has been changed (for
		* example, a component has been enabled or disabled). The data contains
		* the name of the package.
		* <ul>
		* <li> {@link #EXTRA_UID} containing the integer uid assigned to the package.
		* <li> {@link #EXTRA_CHANGED_COMPONENT_NAME_LIST} containing the class name
		@@ -2010,9 +2010,9 @@ public class Intent implements Parcelable, Cloneable {
		public static final String ACTION_UID_REMOVED = "android.intent.action.UID_REMOVED";

		/**
		* Broadcast Action: Sent to the installer package of an application
		* when that application is first launched (that is the first time it
		* is moved out of the stopped state). The data contains the name of the package.
		* Broadcast Action: Sent to the installer package of an application when
		* that application is first launched (that is the first time it is moved
		* out of the stopped state). The data contains the name of the package.
		*
		* <p class="note">This is a protected intent that can only be sent
		* by the system.
		@@ -2040,8 +2040,9 @@ public class Intent implements Parcelable, Cloneable {
		public static final String ACTION_PACKAGE_VERIFIED = "android.intent.action.PACKAGE_VERIFIED";

		/**
		* Broadcast Action: Sent to the system intent filter verifier when an intent filter
		* needs to be verified. The data contains the filter data hosts to be verified against.
		* Broadcast Action: Sent to the system intent filter verifier when an
		* intent filter needs to be verified. The data contains the filter data
		* hosts to be verified against.
		* <p class="note">
		* This is a protected intent that can only be sent by the system.
		* </p>

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1110,7 +1110,7 @@ public abstract class PackageManager {

		/**
		* Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:
		* The device has professional audio level of functionality, performance, and acoustics.
		* The device has professional audio level of functionality and performance.
		*/
		@SdkConstant(SdkConstantType.FEATURE)
		public static final String FEATURE_AUDIO_PRO = "android.hardware.audio.pro";
		@@ -1359,7 +1359,7 @@ public abstract class PackageManager {

		/**
		* Feature for {@link #getSystemAvailableFeatures} and
		* {@link #hasSystemFeature}: The heart rate sensor on this device is an Electrocargiogram.
		* {@link #hasSystemFeature}: The heart rate sensor on this device is an Electrocardiogram.
		*/
		@SdkConstant(SdkConstantType.FEATURE)
		public static final String FEATURE_SENSOR_HEART_RATE_ECG =