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

Merge "Revert "Get rid of double measure"" into tm-dev am: 80832d2efe

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

Change-Id: Id6fccc3f7ac94f3ae5e679463e5b76ad75f75522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wale Ogunwale
2022-06-29 22:41:08 +00:00
committed by Automerger Merge Worker
parent 0e797fc92c 80832d2efe
commit 559d13bcc1
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/view/ViewRootImpl.java
View File

@@ -2804,10 +2804,6 @@ public final class ViewRootImpl implements ViewParent,
// Execute enqueued actions on every traversal in case a detached view enqueued an action // Execute enqueued actions on every traversal in case a detached view enqueued an action
getRunQueue().executeActions(mAttachInfo.mHandler); getRunQueue().executeActions(mAttachInfo.mHandler);
if (mApplyInsetsRequested) {
dispatchApplyInsets(host);
}
if (mFirst) { if (mFirst) {
// make sure touch mode code executes by setting cached value // make sure touch mode code executes by setting cached value
// to opposite of the added touch mode. // to opposite of the added touch mode.
@@ -2871,6 +2867,18 @@ public final class ViewRootImpl implements ViewParent,
} }
} }
if (mApplyInsetsRequested) {
dispatchApplyInsets(host);
if (mLayoutRequested) {
// Short-circuit catching a new layout request here, so
// we don't need to go through two layout passes when things
// change due to fitting system windows, which can happen a lot.
windowSizeMayChange |= measureHierarchy(host, lp,
mView.getContext().getResources(),
desiredWindowWidth, desiredWindowHeight);
}
}
if (layoutRequested) { if (layoutRequested) {
// Clear this now, so that if anything requests a layout in the // Clear this now, so that if anything requests a layout in the
// rest of this function we will catch it and re-run a full // rest of this function we will catch it and re-run a full