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

Commit 09a3325f authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge changes I20bdab1b,Id82f9081 into oc-dev 

am: 64b04468

Change-Id: I6a15a1b5a97b34fd18f885a0137a8d674b7b6589
parents 573daaae 64b04468

core/java/android/app/ActivityOptions.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1244,7 +1244,7 @@ public class ActivityOptions { 
                // Once we parcel the thumbnail for transfering over to the system, create a copy of

                // Once we parcel the thumbnail for transfering over to the system, create a copy of

                // the bitmap to a hardware bitmap and pass through the GraphicBuffer

                // the bitmap to a hardware bitmap and pass through the GraphicBuffer

                if (mThumbnail != null) {

                if (mThumbnail != null) {

                    final Bitmap hwBitmap = mThumbnail.copy(Config.HARDWARE, true /* immutable */);

                    final Bitmap hwBitmap = mThumbnail.copy(Config.HARDWARE, false /* isMutable */);

                    if (hwBitmap != null) {

                    if (hwBitmap != null) {

                        b.putParcelable(KEY_ANIM_THUMBNAIL, hwBitmap.createGraphicBufferHandle());

                        b.putParcelable(KEY_ANIM_THUMBNAIL, hwBitmap.createGraphicBufferHandle());

                    } else {

                    } else {

services/core/java/com/android/server/wm/PinnedStackController.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -155,6 +155,10 @@ class PinnedStackController { 
        mSnapAlgorithm = new PipSnapAlgorithm(service.mContext);

        mSnapAlgorithm = new PipSnapAlgorithm(service.mContext);

        mDisplayInfo.copyFrom(mDisplayContent.getDisplayInfo());

        mDisplayInfo.copyFrom(mDisplayContent.getDisplayInfo());

        reloadResources();

        reloadResources();

        // Initialize the aspect ratio to the default aspect ratio.  Don't do this in reload

        // resources as it would clobber mAspectRatio when entering PiP from fullscreen which

        // triggers a configuration change and the resources to be reloaded.

        mAspectRatio = mDefaultAspectRatio;

    }

    }





    void onConfigurationChanged() {

    void onConfigurationChanged() {
@@ -171,7 +175,6 @@ class PinnedStackController { 
        mCurrentMinSize = mDefaultMinSize;

        mCurrentMinSize = mDefaultMinSize;

        mDefaultAspectRatio = res.getFloat(

        mDefaultAspectRatio = res.getFloat(

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

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

        mAspectRatio = mDefaultAspectRatio;

        final String screenEdgeInsetsDpString = res.getString(

        final String screenEdgeInsetsDpString = res.getString(

                com.android.internal.R.string.config_defaultPictureInPictureScreenEdgeInsets);

                com.android.internal.R.string.config_defaultPictureInPictureScreenEdgeInsets);

        final Size screenEdgeInsetsDp = !screenEdgeInsetsDpString.isEmpty()

        final Size screenEdgeInsetsDp = !screenEdgeInsetsDpString.isEmpty()