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

Browse Source
This commit is contained in:
Tiger Huang
2022-04-07 02:17:08 +00:00
committed by Android (Google) Code Review
parent 451854f66f df309af84e
commit 88fdb7aa46
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2767,17 +2767,16 @@ public final class ViewRootImpl implements ViewParent,
dispatchApplyInsets(host); dispatchApplyInsets(host);
} }
boolean layoutRequested = mLayoutRequested && (!mStopped || mReportNextDraw);
if (layoutRequested) {
final Resources res = mView.getContext().getResources();
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.
mAttachInfo.mInTouchMode = !mAddedTouchMode; mAttachInfo.mInTouchMode = !mAddedTouchMode;
ensureTouchModeLocally(mAddedTouchMode); ensureTouchModeLocally(mAddedTouchMode);
} else { }
boolean layoutRequested = mLayoutRequested && (!mStopped || mReportNextDraw);
if (layoutRequested) {
if (!mFirst) {
if (lp.width == ViewGroup.LayoutParams.WRAP_CONTENT if (lp.width == ViewGroup.LayoutParams.WRAP_CONTENT
|| lp.height == ViewGroup.LayoutParams.WRAP_CONTENT) { || lp.height == ViewGroup.LayoutParams.WRAP_CONTENT) {
windowSizeMayChange = true; windowSizeMayChange = true;
@@ -2797,7 +2796,7 @@ public final class ViewRootImpl implements ViewParent,
} }
// Ask host how big it wants to be // Ask host how big it wants to be
windowSizeMayChange |= measureHierarchy(host, lp, res, windowSizeMayChange |= measureHierarchy(host, lp, mView.getContext().getResources(),
desiredWindowWidth, desiredWindowHeight); desiredWindowWidth, desiredWindowHeight);
} }