diff --git a/quickstep/src/com/android/launcher3/uioverrides/TwoStepSwipeController.java b/quickstep/src/com/android/launcher3/uioverrides/TwoStepSwipeController.java index 2481c321cc..fb59946abd 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/TwoStepSwipeController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/TwoStepSwipeController.java @@ -90,7 +90,6 @@ public class TwoStepSwipeController extends AnimatorListenerAdapter private static final int FLAG_OVERVIEW_DISABLED_OUT_OF_RANGE = 1 << 0; private static final int FLAG_OVERVIEW_DISABLED_FLING = 1 << 1; private static final int FLAG_OVERVIEW_DISABLED_CANCEL_STATE = 1 << 2; - private static final int FLAG_RECENTS_PLAN_LOADING = 1 << 3; private static final int FLAG_OVERVIEW_DISABLED = 1 << 4; private static final int FLAG_DISABLED_TWO_TARGETS = 1 << 5; private static final int FLAG_DISABLED_BACK_TARGET = 1 << 6; @@ -272,16 +271,7 @@ public class TwoStepSwipeController extends AnimatorListenerAdapter mCurrentAnimation = mLauncher.getStateManager().createAnimationToNewWorkspace( mToState, mTaggedAnimatorSetBuilder, maxAccuracy); - if (TouchInteractionService.isConnected()) { - // Load recents plan - RecentsModel recentsModel = RecentsModel.getInstance(mLauncher); - if (recentsModel.getLastLoadPlan() != null) { - onRecentsPlanLoaded(recentsModel.getLastLoadPlan()); - } else { - mDragPauseDetector.addDisabledFlags(FLAG_RECENTS_PLAN_LOADING); - recentsModel.loadTasks(-1, this::onRecentsPlanLoaded); - } - } else { + if (!TouchInteractionService.isConnected()) { mDragPauseDetector.addDisabledFlags(FLAG_OVERVIEW_DISABLED); } @@ -302,14 +292,6 @@ public class TwoStepSwipeController extends AnimatorListenerAdapter } } - private void onRecentsPlanLoaded(RecentsTaskLoadPlan plan) { - RecentsView recentsView = mLauncher.getOverviewPanel(); - recentsView.update(plan); - recentsView.initToPage(0); - - mDragPauseDetector.clearDisabledFlags(FLAG_RECENTS_PLAN_LOADING); - } - private float getShiftRange() { return mLauncher.getAllAppsController().getShiftRange(); } diff --git a/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java b/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java index 0e539ee0f5..e848688a3b 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java +++ b/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java @@ -30,6 +30,7 @@ import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.graphics.BitmapRenderer; import com.android.launcher3.util.TouchController; import com.android.launcher3.widget.WidgetsFullSheet; +import com.android.quickstep.RecentsView; import com.android.systemui.shared.recents.view.RecentsTransition; public class UiFactory { @@ -96,4 +97,9 @@ public class UiFactory { return result; } } + + public static void resetOverview(Launcher launcher) { + RecentsView recents = launcher.getOverviewPanel(); + recents.reset(); + } } diff --git a/quickstep/src/com/android/quickstep/NavBarSwipeInteractionHandler.java b/quickstep/src/com/android/quickstep/NavBarSwipeInteractionHandler.java index ce528e38a4..168c1fed52 100644 --- a/quickstep/src/com/android/quickstep/NavBarSwipeInteractionHandler.java +++ b/quickstep/src/com/android/quickstep/NavBarSwipeInteractionHandler.java @@ -24,6 +24,7 @@ import android.app.ActivityOptions; import android.content.Context; import android.content.res.Resources; import android.graphics.Bitmap; +import android.graphics.Color; import android.graphics.Rect; import android.os.Build; import android.os.Handler; @@ -56,14 +57,10 @@ import com.android.systemui.shared.system.WindowManagerWrapper; public class NavBarSwipeInteractionHandler extends InternalStateHandler { private static final int STATE_LAUNCHER_READY = 1 << 0; - private static final int STATE_RECENTS_DELAY_COMPLETE = 1 << 1; - private static final int STATE_LOAD_PLAN_READY = 1 << 2; - private static final int STATE_RECENTS_FULLY_VISIBLE = 1 << 3; private static final int STATE_ACTIVITY_MULTIPLIER_COMPLETE = 1 << 4; private static final int STATE_SCALED_SNAPSHOT_RECENTS = 1 << 5; private static final int STATE_SCALED_SNAPSHOT_APP = 1 << 6; - private static final long RECENTS_VIEW_VISIBILITY_DELAY = 120; private static final long RECENTS_VIEW_VISIBILITY_DURATION = 150; private static final long MAX_SWIPE_DURATION = 200; private static final long MIN_SWIPE_DURATION = 80; @@ -90,7 +87,7 @@ public class NavBarSwipeInteractionHandler extends InternalStateHandler { // animated to 1, so allow for a smooth transition. private final AnimatedFloat mActivityMultiplier = new AnimatedFloat(this::updateFinalShift); - private final int mRunningTaskId; + private final Task mRunningTask; private final Context mContext; private final MultiStateCallback mStateCallback; @@ -102,7 +99,6 @@ public class NavBarSwipeInteractionHandler extends InternalStateHandler { private QuickScrubController mQuickScrubController; private Hotseat mHotseat; private AllAppsScrim mAllAppsScrim; - private RecentsTaskLoadPlan mLoadPlan; private boolean mLauncherReady; private boolean mTouchEndHandled; @@ -114,7 +110,11 @@ public class NavBarSwipeInteractionHandler extends InternalStateHandler { NavBarSwipeInteractionHandler(RunningTaskInfo runningTaskInfo, Context context, @TouchInteractionService.InteractionType int interactionType) { - mRunningTaskId = runningTaskInfo.id; + // TODO: We need a better way for this + TaskKey taskKey = new TaskKey(runningTaskInfo.id, 0, null, UserHandle.myUserId(), 0); + mRunningTask = new Task(taskKey, null, null, "", "", Color.BLACK, Color.BLACK, + true, false, false, false, null, 0, null, false); + mContext = context; mInteractionType = interactionType; WindowManagerWrapper.getInstance().getStableInsets(mStableInsets); @@ -131,11 +131,9 @@ public class NavBarSwipeInteractionHandler extends InternalStateHandler { // Build the state callback mStateCallback = new MultiStateCallback(); mStateCallback.addCallback(STATE_LAUNCHER_READY, this::onLauncherReady); - mStateCallback.addCallback(STATE_LOAD_PLAN_READY | STATE_RECENTS_DELAY_COMPLETE, - this::setTaskPlanToUi); mStateCallback.addCallback(STATE_SCALED_SNAPSHOT_APP, this::resumeLastTask); - mStateCallback.addCallback(STATE_RECENTS_FULLY_VISIBLE | STATE_SCALED_SNAPSHOT_RECENTS - | STATE_ACTIVITY_MULTIPLIER_COMPLETE, + mStateCallback.addCallback( + STATE_SCALED_SNAPSHOT_RECENTS | STATE_ACTIVITY_MULTIPLIER_COMPLETE, this::onAnimationToLauncherComplete); mStateCallback.addCallback(STATE_LAUNCHER_READY | STATE_SCALED_SNAPSHOT_APP, this::cleanupLauncher); @@ -145,10 +143,6 @@ public class NavBarSwipeInteractionHandler extends InternalStateHandler { mLauncherReady = true; executeFrameUpdate(); - // Wait for some time before loading recents so that the first frame is fast - new Handler().postDelayed(() -> mStateCallback.setState(STATE_RECENTS_DELAY_COMPLETE), - RECENTS_VIEW_VISIBILITY_DELAY); - long duration = Math.min(MAX_SWIPE_DURATION, Math.max((long) (-mCurrentDisplacement / PIXEL_PER_MS), MIN_SWIPE_DURATION)); if (mCurrentShift.getCurrentAnimation() != null) { @@ -189,18 +183,20 @@ public class NavBarSwipeInteractionHandler extends InternalStateHandler { @Override protected void init(Launcher launcher, boolean alreadyOnHome) { - AbstractFloatingView.closeAllOpenViews(launcher, alreadyOnHome); - launcher.getStateManager().goToState(LauncherState.OVERVIEW, alreadyOnHome); - mLauncher = launcher; + mRecentsView = launcher.getOverviewPanel(); + mRecentsView.showTask(mRunningTask); + mStateController = mRecentsView.getStateController(); + mHotseat = mLauncher.getHotseat(); + mAllAppsScrim = mLauncher.findViewById(R.id.all_apps_scrim); + + AbstractFloatingView.closeAllOpenViews(mLauncher, alreadyOnHome); + mLauncher.getStateManager().goToState(LauncherState.OVERVIEW, alreadyOnHome); + mDragView = new SnapshotDragView(mLauncher, mTaskSnapshot); mLauncher.getDragLayer().addView(mDragView); mDragView.setPivotX(0); mDragView.setPivotY(0); - mRecentsView = launcher.getOverviewPanel(); - mStateController = mRecentsView.getStateController(); - mHotseat = mLauncher.getHotseat(); - mAllAppsScrim = mLauncher.findViewById(R.id.all_apps_scrim); boolean interactionIsQuick = mInteractionType == TouchInteractionService.INTERACTION_QUICK_SCRUB @@ -220,8 +216,6 @@ public class NavBarSwipeInteractionHandler extends InternalStateHandler { // All-apps search box is visible in vertical bar layout. mLauncher.getAppsView().setVisibility(View.GONE); } - mStateController.setTransitionProgress(1); - mStateController.setVisibility(false); TraceHelper.partitionSection("TouchInt", "Launcher on new intent"); } @@ -272,26 +266,6 @@ public class NavBarSwipeInteractionHandler extends InternalStateHandler { ? mHotseat.getWidth() : mHotseat.getHeight(); } - @UiThread - public void setRecentsTaskLoadPlan(RecentsTaskLoadPlan loadPlan) { - mLoadPlan = loadPlan; - mStateCallback.setState(STATE_LOAD_PLAN_READY); - } - - private void setTaskPlanToUi() { - mRecentsView.update(mLoadPlan); - mRecentsView.initToPage(mStartedQuickScrubFromHome ? 0 : mRecentsView.getFirstTaskIndex()); - ObjectAnimator anim = mStateController.animateVisibility(true /* isVisible */) - .setDuration(RECENTS_VIEW_VISIBILITY_DURATION); - anim.addListener(new AnimationSuccessListener() { - @Override - public void onAnimationSuccess(Animator animator) { - mStateCallback.setState(STATE_RECENTS_FULLY_VISIBLE); - } - }); - anim.start(); - } - @UiThread public void endTouch(float endVelocity) { if (mTouchEndHandled) { @@ -339,19 +313,16 @@ public class NavBarSwipeInteractionHandler extends InternalStateHandler { @UiThread private void resumeLastTask() { - TaskKey key = null; - if (mLoadPlan != null) { - Task task = mLoadPlan.getTaskStack().findTaskWithId(mRunningTaskId); + // TODO: We need a better way for this + TaskKey key = mRunningTask.key; + RecentsTaskLoadPlan loadPlan = RecentsModel.getInstance(mContext).getLastLoadPlan(); + if (loadPlan != null) { + Task task = loadPlan.getTaskStack().findTaskWithId(key.id); if (task != null) { key = task.key; } } - if (key == null) { - // TODO: We need a better way for this - key = new TaskKey(mRunningTaskId, 0, null, UserHandle.myUserId(), 0); - } - ActivityOptions opts = ActivityOptions.makeCustomAnimation(mContext, 0, 0); ActivityManagerWrapper.getInstance().startActivityFromRecentsAsync(key, opts, null, null); } @@ -372,7 +343,8 @@ public class NavBarSwipeInteractionHandler extends InternalStateHandler { if (mInteractionType == TouchInteractionService.INTERACTION_QUICK_SWITCH) { for (int i = mRecentsView.getFirstTaskIndex(); i < mRecentsView.getPageCount(); i++) { TaskView taskView = (TaskView) mRecentsView.getPageAt(i); - if (taskView.getTask().key.id != mRunningTaskId) { + // TODO: Match the keys directly + if (taskView.getTask().key.id != mRunningTask.key.id) { mRecentsView.snapToPage(i, QUICK_SWITCH_SNAP_DURATION); taskView.postDelayed(() -> {taskView.launchTask(true);}, QUICK_SWITCH_SNAP_DURATION); diff --git a/quickstep/src/com/android/quickstep/RecentsModel.java b/quickstep/src/com/android/quickstep/RecentsModel.java index 112f1569c2..22658b29dc 100644 --- a/quickstep/src/com/android/quickstep/RecentsModel.java +++ b/quickstep/src/com/android/quickstep/RecentsModel.java @@ -15,8 +15,10 @@ */ package com.android.quickstep; +import android.annotation.TargetApi; import android.content.Context; import android.content.res.Resources; +import android.os.Build; import android.os.Looper; import android.os.UserHandle; @@ -25,7 +27,9 @@ import com.android.launcher3.R; import com.android.systemui.shared.recents.model.RecentsTaskLoadPlan; import com.android.systemui.shared.recents.model.RecentsTaskLoadPlan.PreloadOptions; import com.android.systemui.shared.recents.model.RecentsTaskLoader; +import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.BackgroundExecutor; +import com.android.systemui.shared.system.TaskStackChangeListener; import java.util.concurrent.ExecutionException; import java.util.function.Consumer; @@ -33,7 +37,8 @@ import java.util.function.Consumer; /** * Singleton class to load and manage recents model. */ -public class RecentsModel { +@TargetApi(Build.VERSION_CODES.O) +public class RecentsModel extends TaskStackChangeListener { // We do not need any synchronization for this variable as its only written on UI thread. private static RecentsModel INSTANCE; @@ -59,6 +64,9 @@ public class RecentsModel { private final MainThreadExecutor mMainThreadExecutor; private RecentsTaskLoadPlan mLastLoadPlan; + private int mLastLoadPlanId; + private int mTaskChangeId; + private RecentsModel(Context context) { mContext = context; @@ -69,6 +77,10 @@ public class RecentsModel { mRecentsTaskLoader.startLoader(mContext); mMainThreadExecutor = new MainThreadExecutor(); + ActivityManagerWrapper.getInstance().registerTaskStackListener(this); + + mTaskChangeId = 1; + loadTasks(-1, null); } public RecentsTaskLoader getRecentsTaskLoader() { @@ -80,8 +92,20 @@ public class RecentsModel { * @param taskId The running task id or -1 * @param callback The callback to receive the task plan once its complete or null. This is * always called on the UI thread. + * @return the request id associated with this call. */ - public void loadTasks(int taskId, Consumer callback) { + public int loadTasks(int taskId, Consumer callback) { + final int requestId = mTaskChangeId; + + // Fail fast if nothing has changed. + if (mLastLoadPlanId == mTaskChangeId) { + if (callback != null) { + final RecentsTaskLoadPlan plan = mLastLoadPlan; + mMainThreadExecutor.execute(() -> callback.accept(plan)); + } + return requestId; + } + BackgroundExecutor.get().submit(() -> { // Preload the plan RecentsTaskLoadPlan loadPlan = new RecentsTaskLoadPlan(mContext); @@ -91,11 +115,23 @@ public class RecentsModel { // Set the load plan on UI thread mMainThreadExecutor.execute(() -> { mLastLoadPlan = loadPlan; + mLastLoadPlanId = requestId; + if (callback != null) { callback.accept(loadPlan); } }); }); + return requestId; + } + + @Override + public void onTaskStackChanged() { + mTaskChangeId++; + } + + public boolean isLoadPlanValid(int resultId) { + return mTaskChangeId == resultId; } public RecentsTaskLoadPlan getLastLoadPlan() { diff --git a/quickstep/src/com/android/quickstep/RecentsView.java b/quickstep/src/com/android/quickstep/RecentsView.java index 09003b2d9f..d1bbd23bc2 100644 --- a/quickstep/src/com/android/quickstep/RecentsView.java +++ b/quickstep/src/com/android/quickstep/RecentsView.java @@ -16,8 +16,6 @@ package com.android.quickstep; -import static com.android.launcher3.LauncherState.OVERVIEW; - import android.animation.LayoutTransition; import android.content.Context; import android.graphics.Rect; @@ -27,10 +25,8 @@ import android.view.View; import com.android.launcher3.DeviceProfile; import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherState; import com.android.launcher3.PagedView; import com.android.launcher3.R; -import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.uioverrides.OverviewState; import com.android.launcher3.uioverrides.RecentsViewStateController; import com.android.systemui.shared.recents.model.RecentsTaskLoadPlan; @@ -44,6 +40,8 @@ import com.android.systemui.shared.system.WindowManagerWrapper; import java.util.ArrayList; +import static com.android.launcher3.LauncherState.NORMAL; + /** * A list of recent tasks. */ @@ -60,6 +58,9 @@ public class RecentsView extends PagedView { private boolean mTaskStackListenerRegistered; private LayoutTransition mLayoutTransition; + /** + * TODO: Call reloadIdNeeded in onTaskStackChanged. + */ private TaskStackChangeListener mTaskStackListener = new TaskStackChangeListener() { @Override public void onTaskSnapshotChanged(int taskId, ThumbnailData snapshot) { @@ -76,6 +77,11 @@ public class RecentsView extends PagedView { private RecentsViewStateController mStateController; private int mFirstTaskIndex; + private final RecentsModel mModel; + private int mLoadPlanId = -1; + + private Task mFirstTask; + public RecentsView(Context context) { this(context, null); } @@ -93,6 +99,7 @@ public class RecentsView extends PagedView { mLauncher = Launcher.getLauncher(context); mQuickScrubController = new QuickScrubController(mLauncher); + mModel = RecentsModel.getInstance(context); mScrollState.isRtl = mIsRtl; } @@ -115,7 +122,6 @@ public class RecentsView extends PagedView { Rect padding = getPadding(Launcher.getLauncher(getContext()).getDeviceProfile(), getContext()); setPadding(padding.left, padding.top, padding.right, padding.bottom); - mFirstTaskIndex = getPageCount(); } @@ -154,9 +160,8 @@ public class RecentsView extends PagedView { updateTaskStackListenerState(); } - public void update(RecentsTaskLoadPlan loadPlan) { - final RecentsTaskLoader loader = RecentsModel.getInstance(getContext()) - .getRecentsTaskLoader(); + private void applyLoadPlan(RecentsTaskLoadPlan loadPlan) { + final RecentsTaskLoader loader = mModel.getRecentsTaskLoader(); TaskStack stack = loadPlan != null ? loadPlan.getTaskStack() : null; if (stack == null) { removeAllViews(); @@ -166,10 +171,17 @@ public class RecentsView extends PagedView { // Ensure there are as many views as there are tasks in the stack (adding and trimming as // necessary) final LayoutInflater inflater = LayoutInflater.from(getContext()); - final ArrayList tasks = stack.getTasks(); + final ArrayList tasks = new ArrayList<>(stack.getTasks()); setLayoutTransition(null); - int requiredChildCount = tasks.size() + mFirstTaskIndex; + if (mFirstTask != null) { + // TODO: Handle this case here once we have a valid implementation for mFirstTask + if (tasks.isEmpty() || !keysEquals(tasks.get(tasks.size() - 1), mFirstTask)) { + // tasks.add(mFirstTask); + } + } + + final int requiredChildCount = tasks.size() + mFirstTaskIndex; for (int i = getChildCount(); i < requiredChildCount; i++) { final TaskView taskView = (TaskView) inflater.inflate(R.layout.task, this, false); addView(taskView); @@ -190,31 +202,17 @@ public class RecentsView extends PagedView { } } - public void initToPage(int pageNo) { - setCurrentPage(pageNo); - if (getPageAt(mCurrentPage) instanceof TaskView) { - ((TaskView) getPageAt(mCurrentPage)).setIconScale(0); - } - } - - public void launchTaskWithId(int taskId) { - for (int i = mFirstTaskIndex; i < getChildCount(); i++) { - final TaskView taskView = (TaskView) getChildAt(i); - if (taskView.getTask().key.id == taskId) { - taskView.launchTask(false /* animate */); - return; - } - } - } - private void updateTaskStackListenerState() { boolean registerStackListener = mOverviewStateEnabled && isAttachedToWindow() && getWindowVisibility() == VISIBLE; if (registerStackListener != mTaskStackListenerRegistered) { if (registerStackListener) { - ActivityManagerWrapper.getInstance().registerTaskStackListener(mTaskStackListener); + ActivityManagerWrapper.getInstance() + .registerTaskStackListener(mTaskStackListener); + reloadIfNeeded(); } else { - ActivityManagerWrapper.getInstance().unregisterTaskStackListener(mTaskStackListener); + ActivityManagerWrapper.getInstance() + .unregisterTaskStackListener(mTaskStackListener); } mTaskStackListenerRegistered = registerStackListener; } @@ -302,11 +300,74 @@ public class RecentsView extends PagedView { public void onTaskDismissed(TaskView taskView) { ActivityManagerWrapper.getInstance().removeTask(taskView.getTask().key.id); removeView(taskView); - if (getChildCount() == mFirstTaskIndex) { - mLauncher.getStateManager().goToState(LauncherState.NORMAL); + if (getTaskCount() == 0) { + mLauncher.getStateManager().goToState(NORMAL); } } + public void reset() { + mFirstTask = null; + setCurrentPage(0); + } + + public int getTaskCount() { + return getChildCount() - mFirstTaskIndex; + } + + /** + * Reloads the view if anything in recents changed. + */ + public void reloadIfNeeded() { + if (!mModel.isLoadPlanValid(mLoadPlanId)) { + int taskId = -1; + if (mFirstTask != null) { + taskId = mFirstTask.key.id; + } + mLoadPlanId = mModel.loadTasks(taskId, this::applyLoadPlan); + } + } + + /** + * Ensures that the first task in the view represents {@param task} and reloads the view + * if needed. This allows the swipe-up gesture to assume that the first tile always + * corresponds to the correct task. + * All subsequent calls to reload will keep the task as the first item until {@link #reset()} + * is called. + * Also scrolls the view to this task + */ + public void showTask(Task task) { + boolean needsReload = false; + boolean inflateFirstChild = true; + if (getTaskCount() > 0) { + TaskView tv = (TaskView) getChildAt(mFirstTaskIndex); + inflateFirstChild = !keysEquals(tv.getTask(), task); + } + if (inflateFirstChild) { + needsReload = true; + setLayoutTransition(null); + // Add an empty view for now + final TaskView taskView = (TaskView) LayoutInflater.from(getContext()) + .inflate(R.layout.task, this, false); + addView(taskView, mFirstTaskIndex); + taskView.bind(task); + setLayoutTransition(mLayoutTransition); + } + if (!needsReload) { + needsReload = !mModel.isLoadPlanValid(mLoadPlanId); + } + if (needsReload) { + mLoadPlanId = mModel.loadTasks(task.key.id, this::applyLoadPlan); + } + mFirstTask = task; + setCurrentPage(mFirstTaskIndex); + ((TaskView) getPageAt(mCurrentPage)).setIconScale(0); + } + + private static boolean keysEquals(Task t1, Task t2) { + // TODO: Match the keys directly + return t1.key.id == t2.key.id; + } + public QuickScrubController getQuickScrubController() { return mQuickScrubController; } diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index 56f0e8920c..0e1bdcf9c3 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -164,7 +164,6 @@ public class TouchInteractionService extends Service { mHomeIntent.setComponent(mLauncher); mEventQueue = new MotionEventQueue(Choreographer.getInstance(), this::handleMotionEvent); - mRecentsModel.loadTasks(-1, null); sConnected = true; } @@ -307,7 +306,7 @@ public class TouchInteractionService extends Service { }); // Preload the plan - mRecentsModel.loadTasks(mRunningTask.id, handler::setRecentsTaskLoadPlan); + mRecentsModel.loadTasks(mRunningTask.id, null); mInteractionHandler = handler; } diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java index 670f57997a..472a5a95c2 100644 --- a/src/com/android/launcher3/LauncherState.java +++ b/src/com/android/launcher3/LauncherState.java @@ -27,6 +27,7 @@ import android.view.animation.Interpolator; import com.android.launcher3.uioverrides.AllAppsState; import com.android.launcher3.states.SpringLoadedState; import com.android.launcher3.uioverrides.OverviewState; +import com.android.launcher3.uioverrides.UiFactory; import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType; import java.util.Arrays; @@ -54,6 +55,9 @@ public class LauncherState { private static final LauncherState[] sAllStates = new LauncherState[4]; + /** + * TODO: Create a separate class for NORMAL state. + */ public static final LauncherState NORMAL = new LauncherState(0, ContainerType.WORKSPACE, 0, FLAG_DISABLE_RESTORE | FLAG_WORKSPACE_ICONS_CAN_BE_DRAGGED); @@ -175,6 +179,15 @@ public class LauncherState { return NORMAL; } + /** + * Called when the start transition ends and the user settles on this particular state. + */ + public void onStateTransitionEnd(Launcher launcher) { + if (this == NORMAL) { + UiFactory.resetOverview(launcher); + } + } + protected static void dispatchWindowStateChanged(Launcher launcher) { launcher.getWindow().getDecorView().sendAccessibilityEvent(TYPE_WINDOW_STATE_CHANGED); } diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java index 3a660dcf76..bcb6252b35 100644 --- a/src/com/android/launcher3/LauncherStateManager.java +++ b/src/com/android/launcher3/LauncherStateManager.java @@ -270,6 +270,7 @@ public class LauncherStateManager { mCurrentStableState = state; } + state.onStateTransitionEnd(mLauncher); mLauncher.getWorkspace().setClipChildren(!state.disablePageClipping); mLauncher.getUserEventDispatcher().resetElapsedContainerMillis(); mLauncher.finishAutoCancelActionMode(); diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java b/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java index fc81e80421..2ea10c28b7 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java @@ -56,4 +56,6 @@ public class UiFactory { renderer.render(new Canvas(result)); return result; } + + public static void resetOverview(Launcher launcher) { } }