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

Commit 192fb026 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [13924074, 13924075, 13924587, 13923962, 13924417,... 

Merge cherrypicks of [13924074, 13924075, 13924587, 13923962, 13924417, 13924418, 13924419, 13923941, 13924588, 13923901, 13923902, 13924076, 13924077, 13924420, 13924421, 13924422, 13924423, 13924424, 13924645, 13924589, 13922107, 13924332, 13924333, 13924334, 13924335, 13924336, 13924665, 13923963, 13924646, 13924590, 13924666, 13923971, 13923942] into rvc-qpr2-release

Change-Id: Id3dfd7420a18dbdfba05e8dfffed8ab1c4c4ad63
parents 719eec38 e01fef36

core/res/res/values/dimens.xml

+7 −0
Original line number Diff line number Diff line
@@ -632,6 +632,13 @@ 
    <!-- The default minimal size of a PiP task, in both dimensions. -->

    <dimen name="default_minimal_size_pip_resizable_task">108dp</dimen>



    <!--

      The overridable minimal size of a PiP task, in both dimensions.

      Different from default_minimal_size_pip_resizable_task, this is to limit the dimension

      when the pinned stack size is overridden by app via minWidth/minHeight.

    -->

    <dimen name="overridable_minimal_size_pip_resizable_task">48dp</dimen>



    <!-- Height of a task when in minimized mode from the top when launcher is resizable. -->

    <dimen name="task_height_of_minimized_mode">80dp</dimen>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1927,6 +1927,7 @@ 
  <java-symbol type="fraction" name="config_dimBehindFadeDuration" />

  <java-symbol type="dimen" name="default_minimal_size_resizable_task" />

  <java-symbol type="dimen" name="default_minimal_size_pip_resizable_task" />

  <java-symbol type="dimen" name="overridable_minimal_size_pip_resizable_task" />

  <java-symbol type="dimen" name="task_height_of_minimized_mode" />

  <java-symbol type="fraction" name="config_screenAutoBrightnessDozeScaleFactor" />

  <java-symbol type="bool" name="config_allowPriorityVibrationsInLowPowerMode" />

packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java

+12 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import android.os.Handler; 
import android.os.IBinder;

import android.os.Looper;

import android.os.RemoteException;

import android.util.EventLog;

import android.util.Log;

import android.util.Size;

import android.view.SurfaceControl;
@@ -223,6 +224,7 @@ public class PipTaskOrganizer extends TaskOrganizer implements 
    private PipSurfaceTransactionHelper.SurfaceControlTransactionFactory

            mSurfaceControlTransactionFactory;

    private PictureInPictureParams mPictureInPictureParams;

    private int mOverridableMinSize;



    /**

     * If set to {@code true}, the entering animation will be skipped and we will wait for
@@ -244,6 +246,8 @@ public class PipTaskOrganizer extends TaskOrganizer implements 
        mPipBoundsHandler = boundsHandler;

        mEnterExitAnimationDuration = context.getResources()

                .getInteger(R.integer.config_pipResizeAnimationDuration);

        mOverridableMinSize = context.getResources().getDimensionPixelSize(

                com.android.internal.R.dimen.overridable_minimal_size_pip_resizable_task);

        mSurfaceTransactionHelper = surfaceTransactionHelper;

        mPipAnimationController = pipAnimationController;

        mPipUiEventLoggerLogger = pipUiEventLogger;
@@ -949,7 +953,14 @@ public class PipTaskOrganizer extends TaskOrganizer implements 
        // -1 will be populated if an activity specifies defaultWidth/defaultHeight in <layout>

        // without minWidth/minHeight

        if (windowLayout.minWidth > 0 && windowLayout.minHeight > 0) {

            return new Size(windowLayout.minWidth, windowLayout.minHeight);

            // If either dimension is smaller than the allowed minimum, adjust them

            // according to mOverridableMinSize and log to SafeNet

            if (windowLayout.minWidth < mOverridableMinSize

                    || windowLayout.minHeight < mOverridableMinSize) {

                EventLog.writeEvent(0x534e4554, "174302616", -1, "");

            }

            return new Size(Math.max(windowLayout.minWidth, mOverridableMinSize),

                    Math.max(windowLayout.minHeight, mOverridableMinSize));

        }

        return null;

    }

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotNotificationsController.java

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ public class ScreenshotNotificationsController { 
                dpm.createAdminSupportIntent(DevicePolicyManager.POLICY_DISABLE_SCREEN_CAPTURE);

        if (intent != null) {

            final PendingIntent pendingIntent = PendingIntent.getActivityAsUser(

                    mContext, 0, intent, 0, null, UserHandle.CURRENT);

                    mContext, 0, intent, PendingIntent.FLAG_IMMUTABLE, null, UserHandle.CURRENT);

            b.setContentIntent(pendingIntent);

        }

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java

+10 −0
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi 
    public static final int STATE_DOT = 1;

    public static final int STATE_HIDDEN = 2;



    /** Maximum allowed width or height for an icon drawable */

    private static final int MAX_IMAGE_SIZE = 500;



    private static final String TAG = "StatusBarIconView";

    private static final Property<StatusBarIconView, Float> ICON_APPEAR_AMOUNT

            = new FloatProperty<StatusBarIconView>("iconAppearAmount") {
@@ -378,6 +381,13 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi 
            Log.w(TAG, "No icon for slot " + mSlot + "; " + mIcon.icon);

            return false;

        }



        if (drawable.getIntrinsicWidth() > MAX_IMAGE_SIZE

                || drawable.getIntrinsicHeight() > MAX_IMAGE_SIZE) {

            Log.w(TAG, "Drawable is too large " + mIcon);

            return false;

        }



        if (withClear) {

            setImageDrawable(null);

        }