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

Merge "Prevent ArrayList allocation for prefer keep clear areas" into tm-dev

Browse Source
This commit is contained in:
Robert Horvath
2022-03-25 13:57:41 +00:00
committed by Android (Google) Code Review
parent c5f7947c18 e10a3513f4
commit 9d55afe25d
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11939,13 +11939,22 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
@NonNull @NonNull
List<Rect> collectPreferKeepClearRects() { List<Rect> collectPreferKeepClearRects() {
ListenerInfo info = mListenerInfo; ListenerInfo info = mListenerInfo;
final List<Rect> list = new ArrayList<>(); boolean keepBoundsClear =
(info != null && info.mPreferKeepClear) || mPreferKeepClearForFocus;
boolean hasCustomKeepClearRects = info != null && info.mKeepClearRects != null;
if ((info != null && info.mPreferKeepClear) || mPreferKeepClearForFocus) { if (!keepBoundsClear && !hasCustomKeepClearRects) {
return Collections.emptyList();
} else if (keepBoundsClear && !hasCustomKeepClearRects) {
return Collections.singletonList(new Rect(0, 0, getWidth(), getHeight()));
}
final List<Rect> list = new ArrayList<>();
if (keepBoundsClear) {
list.add(new Rect(0, 0, getWidth(), getHeight())); list.add(new Rect(0, 0, getWidth(), getHeight()));
} }
if (info != null && info.mKeepClearRects != null) { if (hasCustomKeepClearRects) {
list.addAll(info.mKeepClearRects); list.addAll(info.mKeepClearRects);
} }