DO NOT MERGE. Some stuff that is Not Ready. (69717ccd) · Commits · e / os / android_frameworks_base

api/current.xml

+0 −22

Original line number	Diff line number	Diff line
		@@ -46504,17 +46504,6 @@
		visibility="public"
		>
		</field>
		<field name="FLAG_SUPPORTS_XLARGE_SCREENS"
		type="int"
		transient="false"
		volatile="false"
		value="524288"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FLAG_SYSTEM"
		type="int"
		transient="false"
		@@ -51707,17 +51696,6 @@
		visibility="public"
		>
		</field>
		<field name="SCREENLAYOUT_SIZE_XLARGE"
		type="int"
		transient="false"
		volatile="false"
		value="4"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TOUCHSCREEN_FINGER"
		type="int"
		transient="false"

+2 −1

Original line number	Diff line number	Diff line
		@@ -269,6 +269,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		* increased in size for extra large screens. Corresponds to
		* {@link android.R.styleable#AndroidManifestSupportsScreens_xlargeScreens
		* android:xlargeScreens}.
		* @hide
		*/
		public static final int FLAG_SUPPORTS_XLARGE_SCREENS = 1<<19;

		@@ -311,7 +312,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_XLARGE_SCREENS},
		* {@link #FLAG_SUPPORTS_LARGE_SCREENS},
		* {@link #FLAG_RESIZEABLE_FOR_SCREENS},
		* {@link #FLAG_SUPPORTS_SCREEN_DENSITIES}, {@link #FLAG_VM_SAFE_MODE}
		*/

+2 −1

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration
		public static final int SCREENLAYOUT_SIZE_SMALL = 0x01;
		public static final int SCREENLAYOUT_SIZE_NORMAL = 0x02;
		public static final int SCREENLAYOUT_SIZE_LARGE = 0x03;
		/** @hide */
		public static final int SCREENLAYOUT_SIZE_XLARGE = 0x04;

		public static final int SCREENLAYOUT_LONG_MASK = 0x30;
		@@ -83,7 +84,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration
		* <p>The {@link #SCREENLAYOUT_SIZE_MASK} bits define the overall size
		* of the screen. They may be one of
		* {@link #SCREENLAYOUT_SIZE_SMALL}, {@link #SCREENLAYOUT_SIZE_NORMAL},
		* {@link #SCREENLAYOUT_SIZE_LARGE}, or {@link #SCREENLAYOUT_SIZE_XLARGE}.
		* {@link #SCREENLAYOUT_SIZE_LARGE}.
		*
		* <p>The {@link #SCREENLAYOUT_LONG_MASK} defines whether the screen
		* is wider/taller than normal. They may be one of