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

Keep custom keep-clear Rects if preferKeepClear is set

Browse Source 
Since ViewParents can be set to not clip their children, custom
keep clear areas can extend beyond the bounds of its hosting View.
If preferKeepClear is set, add the View's bounds as a keep clear area,
but also keep the custom Rects.

Bug: 221073574
Test: atest KeepClearRectsTests
Change-Id: I85a4e4a223fbba787c5afebf2689a031243808d4
This commit is contained in:
Robert Horvath
2022-02-23 19:06:34 +01:00
parent b57bb86296
commit 9a7444cec5
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11807,8 +11807,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* <p>
* The system will try to respect this preference, but when not possible will ignore it.
* <p>
* Note: while this is set to {@code true}, the system will ignore the {@code Rect}s provided
* through {@link #setPreferKeepClearRects} (but not clear them).
* Note: This is independent from {@link #setPreferKeepClearRects}. If both are set, both will
* be taken into account.
* <p>
* @see #setPreferKeepClearRects
* @see #isPreferKeepClear
@@ -11842,8 +11842,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* <p>
* The system will try to respect this preference, but when not possible will ignore it.
* <p>
* Note: While {@link #isPreferKeepClear} is {@code true}, the {@code Rect}s set here are
* ignored.
* Note: This is independent from {@link #setPreferKeepClear}. If both are set, both will be
* taken into account.
* <p>
* @see #setPreferKeepClear
* @see #getPreferKeepClearRects
@@ -11939,7 +11939,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
final List<Rect> list = new ArrayList();
if (info.mPreferKeepClear) {
list.add(new Rect(0, 0, getWidth(), getHeight()));
} else if (info.mKeepClearRects != null) {
}
if (info.mKeepClearRects != null) {
list.addAll(info.mKeepClearRects);
}
return list;