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

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

Snap for 12004070 from 078be9e9 to 24Q4-release 

Change-Id: Iaedd43bf92fecd3d0b59afe373108546fc1be1ca
parents a095797a 078be9e9

core/res/res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -3833,6 +3833,11 @@ 
    <!-- Message of notification shown when Test Harness Mode is enabled. [CHAR LIMIT=NONE] -->

    <string name="test_harness_mode_notification_message">Perform a factory reset to disable Test Harness Mode.</string>



    <!-- Title of notification shown when device is in the wrong Headless System User Mode configuration. [CHAR LIMIT=NONE] -->

    <string name="wrong_hsum_configuration_notification_title">Wrong HSUM build configuration</string>

    <!-- Message of notification shown when device is in the wrong Headless System User Mode configuration. [CHAR LIMIT=NONE] -->

    <string name="wrong_hsum_configuration_notification_message">The Headless System User Mode state of this device differs from its build configuration. Please factory reset the device.</string>



    <!-- Title of notification shown when serial console is enabled. [CHAR LIMIT=NONE] -->

    <string name="console_running_notification_title">Serial console enabled</string>

    <!-- Message of notification shown when serial console is enabled. [CHAR LIMIT=NONE] -->

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -2153,6 +2153,8 @@ 
  <java-symbol type="string" name="adbwifi_active_notification_title" />

  <java-symbol type="string" name="test_harness_mode_notification_title" />

  <java-symbol type="string" name="test_harness_mode_notification_message" />

  <java-symbol type="string" name="wrong_hsum_configuration_notification_title" />

  <java-symbol type="string" name="wrong_hsum_configuration_notification_message" />

  <java-symbol type="string" name="console_running_notification_title" />

  <java-symbol type="string" name="console_running_notification_message" />

  <java-symbol type="string" name="mte_override_notification_title" />

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.os.Handler; 
import android.os.UserManager;

import android.view.Choreographer;

import android.view.IWindowManager;

import android.view.SurfaceControl;

import android.view.WindowManager;



import com.android.internal.jank.InteractionJankMonitor;
@@ -400,7 +401,8 @@ public abstract class WMShellModule { 
            Optional<RecentTasksController> recentTasksController,

            HomeTransitionObserver homeTransitionObserver) {

        return new RecentsTransitionHandler(shellInit, transitions,

                recentTasksController.orElse(null), homeTransitionObserver);

                recentTasksController.orElse(null), homeTransitionObserver,

                SurfaceControl.Transaction::new);

    }



    //

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java

+20 −2
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ import com.android.wm.shell.transition.Transitions; 


import java.util.ArrayList;

import java.util.function.Consumer;

import java.util.function.Supplier;



/**

 * Handles the Recents (overview) animation. Only one of these can run at a time. A recents
@@ -84,6 +85,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 


    private final Transitions mTransitions;

    private final ShellExecutor mExecutor;

    private final Supplier<SurfaceControl.Transaction> mTransactionSupplier;

    @Nullable

    private final RecentTasksController mRecentTasksController;

    private IApplicationThread mAnimApp = null;
@@ -101,11 +103,13 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 


    public RecentsTransitionHandler(ShellInit shellInit, Transitions transitions,

            @Nullable RecentTasksController recentTasksController,

            HomeTransitionObserver homeTransitionObserver) {

            HomeTransitionObserver homeTransitionObserver,

            Supplier<SurfaceControl.Transaction> transactionSupplier) {

        mTransitions = transitions;

        mExecutor = transitions.getMainExecutor();

        mRecentTasksController = recentTasksController;

        mHomeTransitionObserver = homeTransitionObserver;

        mTransactionSupplier = transactionSupplier;

        if (!Transitions.ENABLE_SHELL_TRANSITIONS) return;

        if (recentTasksController == null) return;

        shellInit.addInitCallback(() -> {
@@ -1056,7 +1060,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 
            final Transitions.TransitionFinishCallback finishCB = mFinishCB;

            mFinishCB = null;



            final SurfaceControl.Transaction t = mFinishTransaction;

            SurfaceControl.Transaction t = mFinishTransaction;

            final WindowContainerTransaction wct = new WindowContainerTransaction();



            if (mKeyguardLocked && mRecentsTask != null) {
@@ -1106,6 +1110,16 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 
                    }

                }

                ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION, "  normal finish");

                if (toHome && !mOpeningTasks.isEmpty()) {

                    // Attempting to start a task after swipe to home, don't show it,

                    // move recents to top

                    ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION,

                            "  attempting to start a task after swipe to home");

                    t = mTransactionSupplier.get();

                    wct.reorder(mRecentsTask, true /*onTop*/);

                    mClosingTasks.addAll(mOpeningTasks);

                    mOpeningTasks.clear();

                }

                // The general case: committing to recents, going home, or switching tasks.

                for (int i = 0; i < mOpeningTasks.size(); ++i) {

                    t.show(mOpeningTasks.get(i).mTaskSurface);
@@ -1174,6 +1188,10 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 
                    mPipTransaction = null;

                }

            }

            if (t != mFinishTransaction) {

                // apply after merges because these changes are accounting for finishWCT changes.

                mTransitions.setAfterMergeFinishTransaction(mTransition, t);

            }

            cleanUp();

            finishCB.onTransitionFinished(wct.isEmpty() ? null : wct);

            if (runnerFinishCb != null) {

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+1 −1
Original line number Diff line number Diff line
@@ -2649,7 +2649,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            @Nullable TransitionRequestInfo request) {

        final ActivityManager.RunningTaskInfo triggerTask = request.getTriggerTask();

        if (triggerTask == null) {

            if (isSplitActive()) {

            if (isSplitScreenVisible()) {

                ProtoLog.d(WM_SHELL_SPLIT_SCREEN, "handleRequest: transition=%d display rotation",

                        request.getDebugId());

                // Check if the display is rotating.