Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update language to comply with Android's inclusive language guidance" am: 4aab6d6cfe am: 22298bfb7a am: d89a8edb77

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382387

Change-Id: I3cdf20331f857d08184a66ff9ff1e1c3a84cdce6
This commit is contained in:
Treehugger Robot
2020-07-31 15:50:10 +00:00
committed by Automerger Merge Worker
parent 49fc83bc70 d89a8edb77
commit 8ecdbfaafa
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/view/View.java
View File

@@ -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();