Merge "Finish the recents animation when the phone goes to sleep" into sc-dev (afb2cb2c) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import static com.android.launcher3.LauncherState.NO_OFFSET;
		import static com.android.launcher3.util.DisplayController.CHANGE_ACTIVE_SCREEN;
		import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
		import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
		import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
		import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;

		import android.animation.AnimatorSet;
		@@ -189,6 +190,15 @@ public abstract class BaseQuickstepLauncher extends Launcher
		() -> ActivityManagerWrapper.getInstance().invalidateHomeTaskSnapshot(this));
		}

		@Override
		protected void onScreenOff() {
		super.onScreenOff();
		if (LIVE_TILE.get()) {
		RecentsView recentsView = getOverviewPanel();
		recentsView.finishRecentsAnimation(true /* toRecents */, null);
		}
		}

		@Override
		public void startIntentSenderForResult(IntentSender intent, int requestCode,
		Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags, Bundle options) {

+12 −8

Original line number	Diff line number	Diff line
		@@ -1337,14 +1337,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
		private final BroadcastReceiver mScreenOffReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		// Reset AllApps to its initial state only if we are not in the middle of
		// processing a multi-step drop
		if (mPendingRequestArgs == null) {
		if (!isInState(NORMAL)) {
		onUiChangedWhileSleeping();
		}
		mStateManager.goToState(NORMAL);
		}
		onScreenOff();
		}
		};

		@@ -1914,6 +1907,17 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
		}
		}

		protected void onScreenOff() {
		// Reset AllApps to its initial state only if we are not in the middle of
		// processing a multi-step drop
		if (mPendingRequestArgs == null) {
		if (!isInState(NORMAL)) {
		onUiChangedWhileSleeping();
		}
		mStateManager.goToState(NORMAL);
		}
		}

		@TargetApi(Build.VERSION_CODES.M)
		@Override
		protected boolean onErrorStartingShortcut(Intent intent, ItemInfo info) {