Merge "Remove unused private flags from View" (d2ecfc87) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+1 −28

Original line number	Diff line number	Diff line
		@@ -2450,9 +2450,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* 1 PFLAG3_SCROLL_INDICATOR_START
		* 1 PFLAG3_SCROLL_INDICATOR_END
		* 1 PFLAG3_ASSIST_BLOCKED
		* 1 PFLAG3_POINTER_ICON_NULL
		* 1 PFLAG3_POINTER_ICON_VALUE_START
		* 11111111 PFLAG3_POINTER_ICON_MASK
		* xxxxxxxx * NO LONGER NEEDED, SHOULD BE REUSED *
		* 1 PFLAG3_OVERLAPPING_RENDERING_FORCED_VALUE
		* 1 PFLAG3_HAS_OVERLAPPING_RENDERING_FORCED
		* 1 PFLAG3_TEMPORARY_DETACH
		@@ -2650,31 +2648,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*/
		static final int PFLAG3_ASSIST_BLOCKED = 0x4000;

		/**
		* The mask for use with private flags indicating bits used for pointer icon shapes.
		*/
		static final int PFLAG3_POINTER_ICON_MASK = 0x7f8000;

		/**
		* Left-shift used for pointer icon shape values in private flags.
		*/
		static final int PFLAG3_POINTER_ICON_LSHIFT = 15;

		/**
		* Value indicating no specific pointer icons.
		*/
		private static final int PFLAG3_POINTER_ICON_NOT_SPECIFIED = 0 << PFLAG3_POINTER_ICON_LSHIFT;

		/**
		* Value indicating {@link PointerIcon.TYPE_NULL}.
		*/
		private static final int PFLAG3_POINTER_ICON_NULL = 1 << PFLAG3_POINTER_ICON_LSHIFT;

		/**
		* The base value for other pointer icon shapes.
		*/
		private static final int PFLAG3_POINTER_ICON_VALUE_START = 2 << PFLAG3_POINTER_ICON_LSHIFT;

		/**
		* Whether this view has rendered elements that overlap (see {@link
		* #hasOverlappingRendering()}, {@link #forceHasOverlappingRendering(boolean)}, and