Merge branch 'donut' into donut-release (65cf60f4) · Commits · e / os / android_frameworks_base

Android.mk

+3 −3

Original line number	Diff line number	Diff line
		@@ -361,13 +361,13 @@ web_docs_sample_code_flags := \

		## SDK version identifiers used in the published docs
		# major[.minor] version for current SDK. (full releases only)
		framework_docs_SDK_VERSION:=1.5
		framework_docs_SDK_VERSION:=1.6
		# release version (ie "Release x") (full releases only)
		framework_docs_SDK_REL_ID:=3
		framework_docs_SDK_REL_ID:=1
		# name of current SDK directory (full releases only)
		framework_docs_SDK_CURRENT_DIR:=$(framework_docs_SDK_VERSION)_r$(framework_docs_SDK_REL_ID)
		# flag to build offline docs for a preview release
		framework_docs_SDK_PREVIEW:=true
		framework_docs_SDK_PREVIEW:=0

		framework_docs_LOCAL_DROIDDOC_OPTIONS += \
		-hdf sdk.version $(framework_docs_SDK_VERSION) \

api/4.xml

+5 −5

Original line number	Diff line number	Diff line
		@@ -51157,7 +51157,7 @@
		<method name="breakText"
		return="int"
		abstract="false"
		native="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		@@ -51201,7 +51201,7 @@
		<method name="breakText"
		return="int"
		abstract="false"
		native="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		@@ -51769,7 +51769,7 @@
		<method name="measureText"
		return="float"
		abstract="false"
		native="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		@@ -51786,7 +51786,7 @@
		<method name="measureText"
		return="float"
		abstract="false"
		native="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		@@ -51803,7 +51803,7 @@
		<method name="measureText"
		return="float"
		abstract="false"
		native="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"

api/current.xml

+5 −5

Original line number	Diff line number	Diff line
		@@ -51157,7 +51157,7 @@
		<method name="breakText"
		return="int"
		abstract="false"
		native="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		@@ -51201,7 +51201,7 @@
		<method name="breakText"
		return="int"
		abstract="false"
		native="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		@@ -51769,7 +51769,7 @@
		<method name="measureText"
		return="float"
		abstract="false"
		native="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		@@ -51786,7 +51786,7 @@
		<method name="measureText"
		return="float"
		abstract="false"
		native="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		@@ -51803,7 +51803,7 @@
		<method name="measureText"
		return="float"
		abstract="false"
		native="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"

core/java/android/app/Activity.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -2481,14 +2481,15 @@ public class Activity extends ContextThemeWrapper
		*
		* <p>You can use this function as a simple way to launch the search UI, in response to a
		* menu item, search button, or other widgets within your activity. Unless overidden,
		* calling this function is the same as calling:
		* <p>The default implementation simply calls
		* {@link #startSearch startSearch(null, false, null, false)}, launching a local search.
		* calling this function is the same as calling
		* {@link #startSearch startSearch(null, false, null, false)}, which launches
		* search for the current activity as specified in its manifest, see {@link SearchManager}.
		*
		* <p>You can override this function to force global search, e.g. in response to a dedicated
		* search key, or to block search entirely (by simply returning false).
		*
		* @return Returns true if search launched, false if activity blocks it
		* @return Returns {@code true} if search launched, and {@code false} if activity blocks it.
		* The default implementation always returns {@code true}.
		*
		* @see android.app.SearchManager
		*/

core/java/android/app/SearchManager.java

+12 −12

Original line number	Diff line number	Diff line
		@@ -768,8 +768,11 @@ import java.util.List;
		* </tr>
		*
		* <tr><th>android:icon</th>
		* <td>If provided, this icon will be used <i>in place</i> of the label string. This
		* is provided in order to present logos or other non-textual banners.</td>
		* <td>If provided, this icon will be shown in place of the label above the search box.
		* This is a reference to a drawable (icon) resource. Note that the application icon
		* is also used as an icon to the left of the search box and you cannot modify this
		* behavior, so including the icon attribute is unecessary and this may be
		* deprecated in the future.</td>
		* <td align="center">No</td>
		* </tr>
		*
		@@ -779,11 +782,6 @@ import java.util.List;
		* <td align="center">No</td>
		* </tr>
		*
		* <tr><th>android:searchButtonText</th>
		* <td>If provided, this text will replace the default text in the "Search" button.</td>
		* <td align="center">No</td>
		* </tr>
		*
		* <tr><th>android:searchMode</th>
		* <td>If provided and non-zero, sets additional modes for control of the search
		* presentation. The following mode bits are defined:
		@@ -791,15 +789,17 @@ import java.util.List;
		* <tbody>
		* <tr><th>showSearchLabelAsBadge</th>
		* <td>If set, this flag enables the display of the search target (label)
		* within the search bar. If this flag and showSearchIconAsBadge
		* above the search box. If this flag and showSearchIconAsBadge
		* (see below) are both not set, no badge will be shown.</td>
		* </tr>
		* <tr><th>showSearchIconAsBadge</th>
		* <td>If set, this flag enables the display of the search target (icon) within
		* the search bar. If this flag and showSearchLabelAsBadge
		* <td>If set, this flag enables the display of the search target (icon)
		* above the search box. If this flag and showSearchLabelAsBadge
		* (see above) are both not set, no badge will be shown. If both flags
		* are set, showSearchIconAsBadge has precedence and the icon will be
		* shown.</td>
		* shown. Because the application icon is now used to the left of the
		* search box by default, using this search mode is no longer necessary
		* and may be deprecated in the future.</td>
		* </tr>
		* <tr><th>queryRewriteFromData</th>
		* <td>If set, this flag causes the suggestion column SUGGEST_COLUMN_INTENT_DATA