Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13993a01 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Revert "Remove enabled flag reduce_unnecessary_measure"" into main

parents 086ac766 482f7248

core/java/android/view/ViewRootImpl.java

+12 −2
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FIT_INSETS_CO 
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_DECOR_VIEW_VISIBILITY;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_INSET_PARENT_FRAME_BY_IME;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_LAYOUT_SIZE_EXTENDED_BY_CUTOUT;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_OPTIMIZE_MEASURE;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_OVERRIDE_LAYOUT_IN_DISPLAY_CUTOUT_MODE;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_SYSTEM_APPLICATION_OVERLAY;

import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;
@@ -3506,6 +3507,14 @@ public final class ViewRootImpl implements ViewParent, 
                || lp.type == TYPE_VOLUME_OVERLAY;

    }













    /**













     * @return {@code true} if we should reduce unnecessary measure for the window.













     * TODO(b/260382739): Apply this to all windows.













     */













    private static boolean shouldOptimizeMeasure(final WindowManager.LayoutParams lp) {













        return (lp.privateFlags & PRIVATE_FLAG_OPTIMIZE_MEASURE) != 0;













    }



























    private Rect getWindowBoundsInsetSystemBars() {















        final Rect bounds = new Rect(















                mContext.getResources().getConfiguration().windowConfiguration.getBounds());










@@ -3570,6 +3579,7 @@ public final class ViewRootImpl implements ViewParent,













        mAppVisibilityChanged = false;















        final boolean viewUserVisibilityChanged = !mFirst &&















                ((mViewVisibility == View.VISIBLE) != (viewVisibility == View.VISIBLE));













        final boolean shouldOptimizeMeasure = shouldOptimizeMeasure(lp);





























        WindowManager.LayoutParams params = null;















        Rect frame = mWinFrame;










@@ -3694,7 +3704,7 @@ public final class ViewRootImpl implements ViewParent,



























            // Ask host how big it wants to be















            windowSizeMayChange |= measureHierarchy(host, lp, mView.getContext().getResources(),













                    desiredWindowWidth, desiredWindowHeight, true /* forRootSizeOnly */);













                    desiredWindowWidth, desiredWindowHeight, shouldOptimizeMeasure);















        }





























        if (collectViewAttributes()) {










@@ -3735,7 +3745,7 @@ public final class ViewRootImpl implements ViewParent,













                // change due to fitting system windows, which can happen a lot.















                windowSizeMayChange |= measureHierarchy(host, lp,















                        mView.getContext().getResources(), desiredWindowWidth, desiredWindowHeight,













                        true /* forRootSizeOnly */);













                        shouldOptimizeMeasure);















            }















        }