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

Commit af34c807 authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Use the current dimensions instead of relying on... 

Merge "Use the current dimensions instead of relying on onConfigurationChanged" into sc-v2-dev am: fb1aca81

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

Change-Id: I14b5a046c0c784f8e8b34267487fca0810faa5d0
parents d5f3740e fb1aca81

core/java/com/android/internal/policy/DecorView.java

+7 −15
Original line number Diff line number Diff line
@@ -270,8 +270,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
    private Drawable mCaptionBackgroundDrawable;

    private Drawable mUserCaptionBackgroundDrawable;



    private float mAvailableWidth;



    String mLogTag = TAG;

    private final Rect mFloatingInsets = new Rect();

    private boolean mApplyFloatingVerticalInsets = false;
@@ -315,8 +313,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
        mSemiTransparentBarColor = context.getResources().getColor(

                R.color.system_bar_background_semi_transparent, null /* theme */);



        updateAvailableWidth();



        setWindow(window);



        updateLogTag(params);
@@ -697,7 +693,8 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 


    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        final DisplayMetrics metrics = getContext().getResources().getDisplayMetrics();

        final Resources res = getContext().getResources();

        final DisplayMetrics metrics = res.getDisplayMetrics();

        final boolean isPortrait =

                getResources().getConfiguration().orientation == ORIENTATION_PORTRAIT;
@@ -767,17 +764,19 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 


        if (!fixedWidth && widthMode == AT_MOST) {

            final TypedValue tv = isPortrait ? mWindow.mMinWidthMinor : mWindow.mMinWidthMajor;

            final float availableWidth = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,

                    res.getConfiguration().screenWidthDp, metrics);

            if (tv.type != TypedValue.TYPE_NULL) {

                final int min;

                if (tv.type == TypedValue.TYPE_DIMENSION) {

                    min = (int) tv.getDimension(metrics);

                } else if (tv.type == TypedValue.TYPE_FRACTION) {

                    min = (int)tv.getFraction(mAvailableWidth, mAvailableWidth);

                    min = (int) tv.getFraction(availableWidth, availableWidth);

                } else {

                    min = 0;

                }

                if (DEBUG_MEASURE) Log.d(mLogTag, "Adjust for min width: " + min + ", value::"

                        + tv.coerceToString() + ", mAvailableWidth=" + mAvailableWidth);

                        + tv.coerceToString() + ", mAvailableWidth=" + availableWidth);



                if (width < min) {

                    widthMeasureSpec = MeasureSpec.makeMeasureSpec(min, EXACTLY);
@@ -2144,7 +2143,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 


        updateDecorCaptionStatus(newConfig);



        updateAvailableWidth();

        initializeElevation();

    }
@@ -2616,12 +2614,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
        mLogTag = TAG + "[" + getTitleSuffix(params) + "]";

    }



    private void updateAvailableWidth() {

        Resources res = getResources();

        mAvailableWidth = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,

                res.getConfiguration().screenWidthDp, res.getDisplayMetrics());

    }



    /**

     * @hide

     */