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

Merge "Update touch mode regardless of mStopped" into tm-dev am: 88fdb7aa46

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

Change-Id: I836dfd67e99ee8022cf978a842e5ab0c8c2ac1c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tiger Huang
2022-04-07 02:26:01 +00:00
committed by Automerger Merge Worker
parent 994b2207c3 88fdb7aa46
commit b1b3b872a2
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2767,17 +2767,16 @@ public final class ViewRootImpl implements ViewParent,
dispatchApplyInsets(host);
}
if (mFirst) {
// make sure touch mode code executes by setting cached value
// to opposite of the added touch mode.
mAttachInfo.mInTouchMode = !mAddedTouchMode;
ensureTouchModeLocally(mAddedTouchMode);
}
boolean layoutRequested = mLayoutRequested && (!mStopped || mReportNextDraw);
if (layoutRequested) {
final Resources res = mView.getContext().getResources();
if (mFirst) {
// make sure touch mode code executes by setting cached value
// to opposite of the added touch mode.
mAttachInfo.mInTouchMode = !mAddedTouchMode;
ensureTouchModeLocally(mAddedTouchMode);
} else {
if (!mFirst) {
if (lp.width == ViewGroup.LayoutParams.WRAP_CONTENT
|| lp.height == ViewGroup.LayoutParams.WRAP_CONTENT) {
windowSizeMayChange = true;
@@ -2797,7 +2796,7 @@ public final class ViewRootImpl implements ViewParent,
}
// Ask host how big it wants to be
windowSizeMayChange |= measureHierarchy(host, lp, res,
windowSizeMayChange |= measureHierarchy(host, lp, mView.getContext().getResources(),
desiredWindowWidth, desiredWindowHeight);
}