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

Commit 8d61e06a authored by Xin Li's avatar Xin Li
Browse files

Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future 

Bug: 347831320
Merged-In: Icc555cad17b734e2a9c035991c19bbdc6b02de5d
Change-Id: Ifc2f4879f01242b459614cc46fa66eb90cacd48d
parents 15199cd3 904a97c6

quickstep/AndroidManifest-launcher.xml

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
            android:stateNotNeeded="true"

            android:windowSoftInputMode="adjustPan"

            android:screenOrientation="unspecified"

            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"

            android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"

            android:resizeableActivity="true"

            android:resumeWhilePausing="true"

            android:taskAffinity=""

quickstep/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ 
             android:stateNotNeeded="true"

             android:theme="@style/LauncherTheme"

             android:screenOrientation="behind"

             android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"

             android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"

             android:resizeableActivity="true"

             android:resumeWhilePausing="true"

             android:enableOnBackInvokedCallback="false"

quickstep/src/com/android/quickstep/RecentsActivity.java

+12 −7
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import com.android.launcher3.InvariantDeviceProfile; 
import com.android.launcher3.LauncherAnimationRunner;

import com.android.launcher3.LauncherAnimationRunner.AnimationResult;

import com.android.launcher3.LauncherAnimationRunner.RemoteAnimationFactory;

import com.android.launcher3.LauncherRootView;

import com.android.launcher3.R;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.PendingAnimation;
@@ -139,14 +140,14 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> implem 
                        null /* depthController */, getStatsLogManager(),

                        systemUiProxy, RecentsModel.INSTANCE.get(this),

                        null /*activityBackCallback*/);

        // Setup root and child views

        inflateRootView(R.layout.fallback_recents_activity);

        setContentView(getRootView());

        mDragLayer = findViewById(R.id.drag_layer);

        mScrimView = findViewById(R.id.scrim_view);

        mFallbackRecentsView = findViewById(R.id.overview_panel);

        mActionsView = findViewById(R.id.overview_actions_view);

        getRootView().getSysUiScrim().getSysUIProgress().updateValue(0);

        mDragLayer.recreateControllers();

        LauncherRootView rootView = getRootView();

        mDragLayer = rootView.findViewById(R.id.drag_layer);

        mScrimView = rootView.findViewById(R.id.scrim_view);

        mFallbackRecentsView = rootView.findViewById(R.id.overview_panel);

        mActionsView = rootView.findViewById(R.id.overview_actions_view);



        if (enableDesktopWindowingMode()) {

            mDesktopRecentsTransitionController = new DesktopRecentsTransitionController(

                    getStateManager(), systemUiProxy, getIApplicationThread(),
@@ -156,6 +157,10 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> implem 
        mFallbackRecentsView.init(mActionsView, mSplitSelectStateController,

                mDesktopRecentsTransitionController);



        setContentView(rootView);

        rootView.getSysUiScrim().getSysUIProgress().updateValue(0);

        mDragLayer.recreateControllers();



        mTISBindHelper = new TISBindHelper(this, this::onTISConnected);

    }