Merge commit 'remotes/goog/donut' into donut-release (0ad36b16) · Commits · e / os / android_frameworks_base

api/current.xml

+81 −15

Original line number	Diff line number	Diff line
		@@ -3386,17 +3386,6 @@
		visibility="public"
		>
		</field>
		<field name="donut_resource_pad19"
		type="int"
		transient="false"
		volatile="false"
		value="16843405"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="donut_resource_pad2"
		type="int"
		transient="false"
		@@ -6961,6 +6950,17 @@
		visibility="public"
		>
		</field>
		<field name="resizeable"
		type="int"
		transient="false"
		volatile="false"
		value="16843405"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="resource"
		type="int"
		transient="false"
		@@ -35507,6 +35507,17 @@
		visibility="public"
		>
		</field>
		<field name="FLAG_RESIZEABLE_FOR_SCREENS"
		type="int"
		transient="false"
		volatile="false"
		value="4096"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FLAG_SUPPORTS_LARGE_SCREENS"
		type="int"
		transient="false"
		@@ -39810,7 +39821,51 @@
		visibility="public"
		>
		</field>
		<field name="SCREENLAYOUT_LARGE"
		<field name="SCREENLAYOUT_LONG_MASK"
		type="int"
		transient="false"
		volatile="false"
		value="48"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="SCREENLAYOUT_LONG_NO"
		type="int"
		transient="false"
		volatile="false"
		value="16"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="SCREENLAYOUT_LONG_UNDEFINED"
		type="int"
		transient="false"
		volatile="false"
		value="0"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="SCREENLAYOUT_LONG_YES"
		type="int"
		transient="false"
		volatile="false"
		value="32"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="SCREENLAYOUT_SIZE_LARGE"
		type="int"
		transient="false"
		volatile="false"
		@@ -39821,7 +39876,18 @@
		visibility="public"
		>
		</field>
		<field name="SCREENLAYOUT_NORMAL"
		<field name="SCREENLAYOUT_SIZE_MASK"
		type="int"
		transient="false"
		volatile="false"
		value="15"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="SCREENLAYOUT_SIZE_NORMAL"
		type="int"
		transient="false"
		volatile="false"
		@@ -39832,7 +39898,7 @@
		visibility="public"
		>
		</field>
		<field name="SCREENLAYOUT_SMALL"
		<field name="SCREENLAYOUT_SIZE_SMALL"
		type="int"
		transient="false"
		volatile="false"
		@@ -39843,7 +39909,7 @@
		visibility="public"
		>
		</field>
		<field name="SCREENLAYOUT_UNDEFINED"
		<field name="SCREENLAYOUT_SIZE_UNDEFINED"
		type="int"
		transient="false"
		volatile="false"

core/java/android/app/Dialog.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -788,6 +788,11 @@ public class Dialog implements DialogInterface, Window.Callback,
		final SearchManager searchManager = (SearchManager) mContext
		.getSystemService(Context.SEARCH_SERVICE);

		// can't start search without an associated activity (e.g a system dialog)
		if (!searchManager.hasIdent()) {
		return false;
		}

		// associate search with owner activity if possible (otherwise it will default to
		// global search).
		final ComponentName appName = mOwnerActivity == null ? null

core/java/android/app/SearchManager.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1537,6 +1537,10 @@ public class SearchManager
		ServiceManager.getService(Context.SEARCH_SERVICE));
		}

		/package/ boolean hasIdent() {
		return mIdent != 0;
		}

		/package/ void setIdent(int ident) {
		if (mIdent != 0) {
		throw new IllegalStateException("mIdent already set");

core/java/android/content/Intent.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -4513,6 +4513,9 @@ public class Intent implements Parcelable {
		* and {@link #FILL_IN_COMPONENT} to override the restriction where the
		* corresponding field will not be replaced if it is already set.
		*
		* <p>Note: The component field will only be copied if {@link #FILL_IN_COMPONENT} is explicitly
		* specified.
		*
		* <p>For example, consider Intent A with {data="foo", categories="bar"}
		* and Intent B with {action="gotit", data-type="some/thing",
		* categories="one","two"}.

core/java/android/content/pm/ApplicationInfo.java

+12 −3

Original line number	Diff line number	Diff line
		@@ -160,13 +160,21 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		*/
		public static final int FLAG_SUPPORTS_LARGE_SCREENS = 1<<11;

		/**
		* Value for {@link #flags}: true when the application knows how to adjust
		* its UI for different screen sizes. Corresponds to
		* {@link android.R.styleable#AndroidManifestSupportsScreens_resizeable
		* android:resizeable}.
		*/
		public static final int FLAG_RESIZEABLE_FOR_SCREENS = 1<<12;

		/**
		* Value for {@link #flags}: this is false if the application has set
		* its android:allowBackup to false, true otherwise.
		*
		* {@hide}
		*/
		public static final int FLAG_ALLOW_BACKUP = 1<<12;
		public static final int FLAG_ALLOW_BACKUP = 1<<13;

		/**
		* Indicates that the application supports any densities;
		@@ -183,7 +191,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		* {@link #FLAG_ALLOW_CLEAR_USER_DATA}, {@link #FLAG_UPDATED_SYSTEM_APP},
		* {@link #FLAG_TEST_ONLY}, {@link #FLAG_SUPPORTS_SMALL_SCREENS},
		* {@link #FLAG_SUPPORTS_NORMAL_SCREENS},
		* {@link #FLAG_SUPPORTS_LARGE_SCREENS}.
		* {@link #FLAG_SUPPORTS_LARGE_SCREENS}, {@link #FLAG_RESIZEABLE_FOR_SCREENS}.
		*/
		public int flags = 0;

		@@ -399,7 +407,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		* @hide
		*/
		public void disableCompatibilityMode() {
		flags \|= FLAG_SUPPORTS_LARGE_SCREENS;
		flags \|= (FLAG_SUPPORTS_LARGE_SCREENS \| FLAG_SUPPORTS_NORMAL_SCREENS \|
		FLAG_SUPPORTS_SMALL_SCREENS \| FLAG_RESIZEABLE_FOR_SCREENS);
		supportsDensities = ANY_DENSITIES_ARRAY;
		}
		}