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

Merge "Restore force relayout logic for apps targeting < R" into rvc-dev am: 98f012c304

Browse Source 
Change-Id: I53617d5f35e00cf69dd4e22cb8f5477cbe448ca1
This commit is contained in:
Jorim Jaggi
2020-05-04 20:49:37 +00:00
committed by Automerger Merge Worker
parent 3767c8db8c 98f012c304
commit b4410c5e01
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -981,6 +981,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*/ */
protected static boolean sBrokenWindowBackground; protected static boolean sBrokenWindowBackground;
/**
* Prior to R, we were always forcing a layout of the entire hierarchy when insets changed from
* the server. This is inefficient and not all apps use it. Instead, we want to rely on apps
* calling {@link #requestLayout} when they need to relayout based on an insets change.
*/
static boolean sForceLayoutWhenInsetsChanged;
/** @hide */ /** @hide */
@IntDef({NOT_FOCUSABLE, FOCUSABLE, FOCUSABLE_AUTO}) @IntDef({NOT_FOCUSABLE, FOCUSABLE, FOCUSABLE_AUTO})
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@@ -5375,6 +5382,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
GradientDrawable.sWrapNegativeAngleMeasurements = GradientDrawable.sWrapNegativeAngleMeasurements =
targetSdkVersion >= Build.VERSION_CODES.Q; targetSdkVersion >= Build.VERSION_CODES.Q;
sForceLayoutWhenInsetsChanged = targetSdkVersion < Build.VERSION_CODES.R;
sCompatibilityDone = true; sCompatibilityDone = true;
} }
} }

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

@@ -1584,6 +1584,11 @@ public final class ViewRootImpl implements ViewParent,
mApplyInsetsRequested = true; mApplyInsetsRequested = true;
requestLayout(); requestLayout();
// See comment for View.sForceLayoutWhenInsetsChanged
if (View.sForceLayoutWhenInsetsChanged && mView != null) {
forceLayout(mView);
}
// If this changes during traversal, no need to schedule another one as it will dispatch it // If this changes during traversal, no need to schedule another one as it will dispatch it
// during the current traversal. // during the current traversal.
if (!mIsInTraversal) { if (!mIsInTraversal) {