diff options
| author | Craig Mautner <cmautner@google.com> | 2015-02-20 01:35:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-20 01:35:17 +0000 |
| commit | 4f9796e02851d3595b31ed9e85ddb8ce4089457f (patch) | |
| tree | 7a23e418f7cbd5726e51286a7e6e6545037ed6b3 /core | |
| parent | df337277186868fc7285549cc637403cb99a454e (diff) | |
| parent | 72d6f219438e232fcfe0b732d1adb0dbac79dbac (diff) | |
| download | frameworks_base-4f9796e02851d3595b31ed9e85ddb8ce4089457f.zip frameworks_base-4f9796e02851d3595b31ed9e85ddb8ce4089457f.tar.gz frameworks_base-4f9796e02851d3595b31ed9e85ddb8ce4089457f.tar.bz2 | |
Merge changes Ib2def344,Ifd15736b
* changes:
Permit layout when stopped if reporting draw
Refactor computeScreenConfigurationLocked and more.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 24fae8a..5b138fe 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -1342,7 +1342,7 @@ public final class ViewRootImpl implements ViewParent, boolean insetsChanged = false; - boolean layoutRequested = mLayoutRequested && !mStopped; + boolean layoutRequested = mLayoutRequested && (!mStopped || mReportNextDraw); if (layoutRequested) { final Resources res = mView.getContext().getResources(); @@ -1774,7 +1774,7 @@ public final class ViewRootImpl implements ViewParent, } } - if (!mStopped) { + if (!mStopped || mReportNextDraw) { boolean focusChangedDueToTouchMode = ensureTouchModeLocally( (relayoutResult&WindowManagerGlobal.RELAYOUT_RES_IN_TOUCH_MODE) != 0); if (focusChangedDueToTouchMode || mWidth != host.getMeasuredWidth() @@ -1847,7 +1847,7 @@ public final class ViewRootImpl implements ViewParent, } } - final boolean didLayout = layoutRequested && !mStopped; + final boolean didLayout = layoutRequested && (!mStopped || mReportNextDraw); boolean triggerGlobalLayoutListener = didLayout || mAttachInfo.mRecomputeGlobalAttributes; if (didLayout) { |