mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-27 15:26:58 +00:00
Merge cherrypicks of ['googleplex-android-review.googlesource.com/28584306'] into 24Q3-release.
Change-Id: Ib38362e5793569abe89c0a6dc6669470784fb454
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user