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

Commit d8ca4aef authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10161738 from 2c4eb0e5 to udc-qpr1-release 

Change-Id: I3aad326d429a86d0a44d7e68772521ee82768cea
parents e1f7a98b 2c4eb0e5

core/tests/mockingcoretests/src/android/app/activity/ActivityThreadClientTest.java

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ public class ActivityThreadClientTest { 


            // Verify for ON_START state. Activity should be relaunched.

            getInstrumentation().runOnMainSync(() -> clientSession.startActivity(r));

            recreateAndVerifyRelaunched(activityThread, activity[0], r, ON_START);

            recreateAndVerifyRelaunched(activityThread, activity[0], r, ON_PAUSE);



            // Verify for ON_RESUME state. Activity should be relaunched.

            getInstrumentation().runOnMainSync(() -> clientSession.resumeActivity(r));

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java

+2 −1
Original line number Diff line number Diff line
@@ -709,7 +709,8 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
        return context.getSystemService(WindowManager.class)

                .getMaximumWindowMetrics()

                .getWindowInsets()

                .getInsets(WindowInsets.Type.systemBars() | WindowInsets.Type.displayCutout())

                .getInsetsIgnoringVisibility(WindowInsets.Type.systemBars()

                        | WindowInsets.Type.displayCutout())

                .toRect();

    }

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java

+16 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static android.view.Surface.ROTATION_90; 
import static android.view.WindowManager.TRANSIT_CHANGE;

import static android.view.WindowManager.TRANSIT_OPEN;

import static android.view.WindowManager.TRANSIT_PIP;

import static android.view.WindowManager.TRANSIT_TO_BACK;

import static android.view.WindowManager.transitTypeToString;

import static android.window.TransitionInfo.FLAG_IS_DISPLAY;
@@ -92,6 +93,8 @@ public class PipTransition extends PipTransitionController { 
    private final Rect mExitDestinationBounds = new Rect();

    @Nullable

    private IBinder mExitTransition;

    @Nullable

    private IBinder mMoveToBackTransition;

    private IBinder mRequestedEnterTransition;

    private WindowContainerToken mRequestedEnterTask;

    /** The Task window that is currently in PIP windowing mode. */
@@ -171,9 +174,10 @@ public class PipTransition extends PipTransitionController { 


        // Exiting PIP.

        final int type = info.getType();

        if (transition.equals(mExitTransition)) {

        if (transition.equals(mExitTransition) || transition.equals(mMoveToBackTransition)) {

            mExitDestinationBounds.setEmpty();

            mExitTransition = null;

            mMoveToBackTransition = null;

            mHasFadeOut = false;

            if (mFinishCallback != null) {

                callFinishCallback(null /* wct */);
@@ -201,6 +205,8 @@ public class PipTransition extends PipTransitionController { 
                    startExitToSplitAnimation(info, startTransaction, finishTransaction,

                            finishCallback, pipTaskInfo);

                    break;

                case TRANSIT_TO_BACK:

                    // pass through here is intended

                case TRANSIT_REMOVE_PIP:

                    removePipImmediately(info, startTransaction, finishTransaction, finishCallback,

                            pipTaskInfo);
@@ -273,6 +279,15 @@ public class PipTransition extends PipTransitionController { 
            WindowContainerTransaction wct = new WindowContainerTransaction();

            augmentRequest(transition, request, wct);

            return wct;

        } else if (request.getType() == TRANSIT_TO_BACK && request.getTriggerTask() != null

                && request.getTriggerTask().getWindowingMode() == WINDOWING_MODE_PINNED) {

            // if we receive a TRANSIT_TO_BACK type of request while in PiP

            mMoveToBackTransition = transition;

            // update the transition state to avoid {@link PipTaskOrganizer#onTaskVanished()} calls

            mPipTransitionState.setTransitionState(PipTransitionState.EXITING_PIP);



            // return an empty WindowContainerTransaction so that we don't check other handlers

            return new WindowContainerTransaction();

        } else {

            return null;

        }

packages/SystemUI/res-keyguard/layout/keyguard_security_container_view.xml

+0 −2
Original line number Diff line number Diff line
@@ -19,9 +19,7 @@ 


<com.android.keyguard.KeyguardSecurityContainer

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:id="@+id/keyguard_security_container"

    android:background="?androidprv:attr/materialColorSurfaceContainer"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="false"

packages/SystemUI/res/values/strings.xml

+2 −3
Original line number Diff line number Diff line
@@ -295,9 +295,8 @@ 
    <string name="screenrecord_save_title">Screen recording saved</string>

    <!-- Subtext for a notification shown after saving a screen recording to prompt the user to view it [CHAR_LIMIT=100] -->

    <string name="screenrecord_save_text">Tap to view</string>

    <!-- A toast message shown when there is an error deleting a screen recording [CHAR LIMIT=NONE] -->

    <string name="screenrecord_delete_error">Error deleting screen recording</string>

    <!-- A toast message shown when the screen recording cannot be started due to insufficient permissions [CHAR LIMIT=NONE] -->

    <!-- A toast message shown when there is an error saving a screen recording [CHAR LIMIT=NONE] -->

    <string name="screenrecord_save_error">Error saving screen recording</string>

    <!-- A toast message shown when the screen recording cannot be started due to a generic error [CHAR LIMIT=NONE] -->

    <string name="screenrecord_start_error">Error starting screen recording</string>