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

Commit 8fdc05d8 authored by Xin Li's avatar Xin Li Committed by Automerger Merge Worker
Browse files

DO NOT MERGE - Merge RQ2A.210505.003. am: 4ba43d5b 

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

Change-Id: Ib9103480b9d089c3374ae2adc0ea36a7b664554d
parents 0fd596fd 4ba43d5b

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
@@ -1941,6 +1941,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);

        }

services/core/java/com/android/server/notification/SnoozeHelper.java

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto;

import com.android.internal.util.XmlUtils;

import com.android.server.pm.PackageManagerService;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -463,6 +464,7 @@ public class SnoozeHelper { 
        return PendingIntent.getBroadcast(mContext,

                REQUEST_CODE_REPOST,

                new Intent(REPOST_ACTION)

                        .setPackage(PackageManagerService.PLATFORM_PACKAGE_NAME)

                        .setData(new Uri.Builder().scheme(REPOST_SCHEME).appendPath(key).build())

                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND)

                        .putExtra(EXTRA_KEY, key)