Merge "Update language to comply with Android's inclusive language guidance"... (439cf370) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -951,8 +951,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

	/**		/**
	* Prior to P, {@code #startDragAndDrop} accepts a builder which produces an empty drag shadow.		* Prior to P, {@code #startDragAndDrop} accepts a builder which produces an empty drag shadow.
	* Currently zero size SurfaceControl cannot be created thus we create a dummy 1x1 surface		* Currently zero size SurfaceControl cannot be created thus we create a 1x1 surface instead.
	* instead.
	*/		*/
	private static boolean sAcceptZeroSizeDragShadow;		private static boolean sAcceptZeroSizeDragShadow;

	@@ -29899,7 +29898,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

	/**		/**
	* Dump all private flags in readable format, useful for documentation and		* Dump all private flags in readable format, useful for documentation and
	* sanity checking.		* consistency checking.
	*/		*/
	private static void dumpFlags() {		private static void dumpFlags() {
	final HashMap<String, String> found = Maps.newHashMap();		final HashMap<String, String> found = Maps.newHashMap();