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

Commit 3fda07fa authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6271995 from 1756b8ec to qt-qpr3-release 

Change-Id: Iac45bcd34e45a8da870d503e2f9986ea2eb367f4
parents 15919c6e 1756b8ec

core/jni/AndroidRuntime.cpp

+6 −0
Original line number Diff line number Diff line
@@ -665,6 +665,8 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
    char dex2oatImageCompilerFilterBuf[sizeof("--compiler-filter=")-1 + PROPERTY_VALUE_MAX];

    char dex2oatThreadsBuf[sizeof("-j")-1 + PROPERTY_VALUE_MAX];

    char dex2oatThreadsImageBuf[sizeof("-j")-1 + PROPERTY_VALUE_MAX];

    char dex2oatCpuSetBuf[sizeof("--cpu-set=")-1 + PROPERTY_VALUE_MAX];

    char dex2oatCpuSetImageBuf[sizeof("--cpu-set=")-1 + PROPERTY_VALUE_MAX];

    char dex2oat_isa_variant_key[PROPERTY_KEY_MAX];

    char dex2oat_isa_variant[sizeof("--instruction-set-variant=") -1 + PROPERTY_VALUE_MAX];

    char dex2oat_isa_features_key[PROPERTY_KEY_MAX];
@@ -937,6 +939,10 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
    parseCompilerOption("dalvik.vm.dex2oat-threads", dex2oatThreadsBuf, "-j", "-Xcompiler-option");

    parseCompilerOption("dalvik.vm.image-dex2oat-threads", dex2oatThreadsImageBuf, "-j",

                        "-Ximage-compiler-option");

    parseCompilerOption("dalvik.vm.dex2oat-cpu-set", dex2oatCpuSetBuf, "--cpu-set=",

                        "-Xcompiler-option");

    parseCompilerOption("dalvik.vm.image-dex2oat-cpu-set", dex2oatCpuSetImageBuf, "--cpu-set=",

                        "-Ximage-compiler-option");



    // The runtime will compile a boot image, when necessary, not using installd. Thus, we need to

    // pass the instruction-set-features/variant as an image-compiler-option.

packages/SystemUI/src/com/android/systemui/ScreenDecorations.java

+38 −8
Original line number Diff line number Diff line
@@ -26,8 +26,10 @@ import static com.android.systemui.tuner.TunablePadding.FLAG_END; 
import static com.android.systemui.tuner.TunablePadding.FLAG_START;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

import android.animation.AnimatorSet;

import android.animation.ObjectAnimator;

import android.animation.ValueAnimator;

import android.annotation.Dimension;

import android.annotation.NonNull;

import android.app.ActivityManager;
@@ -869,6 +871,8 @@ public class ScreenDecorations extends SystemUI implements Tunable, 
    public static class DisplayCutoutView extends View implements DisplayManager.DisplayListener,

            RegionInterceptableView {



        private static final float HIDDEN_CAMERA_PROTECTION_SCALE = 0.5f;



        private final DisplayInfo mInfo = new DisplayInfo();

        private final Paint mPaint = new Paint();

        private final List<Rect> mBounds = new ArrayList();
@@ -888,6 +892,8 @@ public class ScreenDecorations extends SystemUI implements Tunable, 
        private int mColor = Color.BLACK;

        private boolean mStart;

        private int mRotation;

        private float mCameraProtectionProgress = HIDDEN_CAMERA_PROTECTION_SCALE;

        private ValueAnimator mCameraProtectionAnimator;



        public DisplayCutoutView(Context context, boolean start,

                Runnable visibilityChangedListener, ScreenDecorations decorations) {
@@ -928,17 +934,18 @@ public class ScreenDecorations extends SystemUI implements Tunable, 
            getLocationOnScreen(mLocation);

            canvas.translate(-mLocation[0], -mLocation[1]);



            if (mShowProtection && !mProtectionRect.isEmpty()) {

                mPaint.setColor(mColor);

                mPaint.setStyle(Paint.Style.FILL);

                mPaint.setAntiAlias(true);

                canvas.drawPath(mProtectionPath, mPaint);

            } else if (!mBoundingPath.isEmpty()) {

            if (!mBoundingPath.isEmpty()) {

                mPaint.setColor(mColor);

                mPaint.setStyle(Paint.Style.FILL);

                mPaint.setAntiAlias(true);

                canvas.drawPath(mBoundingPath, mPaint);

            }

            if (mCameraProtectionProgress > HIDDEN_CAMERA_PROTECTION_SCALE

                    && !mProtectionRect.isEmpty()) {

                canvas.scale(mCameraProtectionProgress, mCameraProtectionProgress,

                        mProtectionRect.centerX(), mProtectionRect.centerY());

                canvas.drawPath(mProtectionPath, mPaint);

            }

        }



        @Override
@@ -973,8 +980,31 @@ public class ScreenDecorations extends SystemUI implements Tunable, 


            mShowProtection = shouldShow;

            updateBoundingPath();

            // Delay the relayout until the end of the animation when hiding the cutout,

            // otherwise we'd clip it.

            if (mShowProtection) {

                requestLayout();

            }

            if (mCameraProtectionAnimator != null) {

                mCameraProtectionAnimator.cancel();

            }

            mCameraProtectionAnimator = ValueAnimator.ofFloat(mCameraProtectionProgress,

                    mShowProtection ? 1.0f : HIDDEN_CAMERA_PROTECTION_SCALE).setDuration(750);

            mCameraProtectionAnimator.setInterpolator(Interpolators.DECELERATE_QUINT);

            mCameraProtectionAnimator.addUpdateListener(animation -> {

                mCameraProtectionProgress = (float) animation.getAnimatedValue();

                invalidate();

            });

            mCameraProtectionAnimator.addListener(new AnimatorListenerAdapter() {

                @Override

                public void onAnimationEnd(Animator animation) {

                    mCameraProtectionAnimator = null;

                    if (!mShowProtection) {

                        requestLayout();

                    }

                }

            });

            mCameraProtectionAnimator.start();

        }



        private boolean isStart() {