Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ecdbfaa authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: 4aab6d6c am: 22298bfb am: d89a8edb

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

Change-Id: I3cdf20331f857d08184a66ff9ff1e1c3a84cdce6
parents 49fc83bc d89a8edb

core/java/android/view/View.java

+2 −3
Original line number 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.













     * Currently zero size SurfaceControl cannot be created thus we create a dummy 1x1 surface













     * instead.













     * Currently zero size SurfaceControl cannot be created thus we create a 1x1 surface instead.















     */















    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













     * sanity checking.













     * consistency checking.















     */















    private static void dumpFlags() {















        final HashMap<String, String> found = Maps.newHashMap();