Merge branch 'mr1.1-staging' of... (f6f6b1d3) · Commits · e / os / android_frameworks_base

Android.mk

+61 −3

Original line number	Diff line number	Diff line
		@@ -218,7 +218,6 @@ LOCAL_SRC_FILES += \
		telephony/java/com/android/internal/telephony/ITelephony.aidl \
		telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \
		telephony/java/com/android/internal/telephony/IWapPushManager.aidl \
		telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl \
		wifi/java/android/net/wifi/IWifiManager.aidl \
		wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \
		voip/java/android/net/sip/ISipSession.aidl \
		@@ -458,7 +457,8 @@ sample_dir := development/samples

		# the list here should match the list of samples included in the sdk samples package
		# (see development/build/sdk.atree)
		web_docs_sample_code_flags := \
		# remove htmlified samples for now -- samples are still available through the SDK
		# web_docs_sample_code_flags := \
		-hdf android.hasSamples 1 \
		-samplecode $(sample_dir)/AccelerometerPlay \
		resources/samples/AccelerometerPlay "Accelerometer Play" \
		@@ -663,7 +663,7 @@ $(static_doc_index_redirect): \
		$(full_target): $(static_doc_index_redirect)
		$(full_target): $(framework_built)

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

		LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)
		@@ -692,6 +692,64 @@ include $(BUILD_DROIDDOC)
		# explicitly specify that online-sdk depends on framework-res and any generated docs
		$(full_target): framework-res-package-target

		# ==== docs for the web (on the devsite 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:=$(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 /

		LOCAL_MODULE := ds

		LOCAL_DROIDDOC_OPTIONS:= \
		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
		$(web_docs_sample_code_flags) \
		-devsite \
		-toroot / \
		-hdf android.whichdoc online \
		-hdf devsite true

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

		include $(BUILD_DROIDDOC)

		# explicitly specify that ds depends on framework-res and any generated docs
		$(full_target): framework-res-package-target


		#==== reference docs for GCM =======================

		include $(CLEAR_VARS)
		#
		gcm_docs_src_files += \
		$(call all-java-files-under, ../../vendor/unbundled_google/libs/gcm/gcm-client/src) \
		$(call all-java-files-under, ../../vendor/unbundled_google/libs/gcm/gcm-server/src) \
		$(call all-html-files-under, ../../vendor/unbundled_google/libs/gcm/gcm-client/src) \
		$(call all-html-files-under, ../../vendor/unbundled_google/libs/gcm/gcm-server/src) \

		LOCAL_SRC_FILES := $(gcm_docs_src_files)
		LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE:= online-gcm-ref
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_IS_HOST_MODULE := false

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

		LOCAL_DROIDDOC_OPTIONS := \
		-toroot / \
		-gcmref \
		-hdf android.whichdoc online \
		-hdf template.showLanguageMenu true

		include $(BUILD_DROIDDOC)

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

CleanSpec.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -137,6 +137,9 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing_intermediates)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing2_intermediates)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing_intermediates)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/android/internal/telephony/IExtendedNetworkService.java)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/android/internal/telephony/IExtendedNetworkService.P)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing_intermediates)
		# ************************************************
		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
		# ************************************************

cmds/content/src/com/android/commands/content/Content.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -83,14 +83,14 @@ public class Content {
		+ " Example:\n"
		+ " # Change \"new_setting\" secure setting to \"newer_value\".\n"
		+ " adb shell content update --uri content://settings/secure --bind"
		+ " value:s:newer_value --where \"name=\'new_setting\'\"\n"
		+ " value:s:newer_value --where \"name=\\'new_setting\\'\"\n"
		+ "\n"
		+ "usage: adb shell content delete --uri <URI> [--user <USER_ID>] --bind <BINDING>"
		+ " [--bind <BINDING>...] [--where <WHERE>]\n"
		+ " Example:\n"
		+ " # Remove \"new_setting\" secure setting.\n"
		+ " adb shell content delete --uri content://settings/secure "
		+ "--where \"name=\'new_setting\'\"\n"
		+ "--where \"name=\\'new_setting\\'\"\n"
		+ "\n"
		+ "usage: adb shell content query --uri <URI> [--user <USER_ID>]"
		+ " [--projection <PROJECTION>] [--where <WHERE>] [--sort <SORT_ORDER>]\n"
		@@ -101,7 +101,7 @@ public class Content {
		+ " # Select \"name\" and \"value\" columns from secure settings where \"name\" is "
		+ "equal to \"new_setting\" and sort the result by name in ascending order.\n"
		+ " adb shell content query --uri content://settings/secure --projection name:value"
		+ " --where \"name=\'new_setting\'\" --sort \"name ASC\"\n"
		+ " --where \"name=\\'new_setting\\'\" --sort \"name ASC\"\n"
		+ "\n";

		private static class Parser {

core/java/android/app/ActionBar.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -131,6 +131,12 @@ public abstract class ActionBar {
		*/
		public static final int DISPLAY_SHOW_CUSTOM = 0x10;

		/**
		* Allow the title to wrap onto multiple lines if space is available
		* @hide pending API approval
		*/
		public static final int DISPLAY_TITLE_MULTIPLE_LINES = 0x20;

		/**
		* Set the action bar into custom navigation mode, supplying a view
		* for custom navigation.
		@@ -679,6 +685,15 @@ public abstract class ActionBar {
		*/
		public Context getThemedContext() { return null; }

		/**
		* Returns true if the Title field has been truncated during layout for lack
		* of available space.
		*
		* @return true if the Title field has been truncated
		* @hide pending API approval
		*/
		public boolean isTitleTruncated() { return false; }

		/**
		* Listener interface for ActionBar navigation events.
		*/

core/java/android/app/Activity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2838,7 +2838,7 @@ public class Activity extends ContextThemeWrapper
		* item has been selected.
		* <p>
		* It is not safe to hold onto the context menu after this method returns.
		* {@inheritDoc}
		*
		*/
		public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
		}