Merge "Using UI_HELPER_THREAD for various activity manager interactions" into ub-launcher3-master (b0588f11) · Commits · e / os / android_packages_apps_Trebuchet

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -19,11 +19,10 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
		import static com.android.launcher3.AbstractFloatingView.TYPE_HIDE_BACK_BUTTON;
		import static com.android.launcher3.LauncherState.FLAG_HIDE_BACK_BUTTON;
		import static com.android.launcher3.LauncherState.NORMAL;
		import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
		import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
		import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;

		import com.android.systemui.shared.system.InteractionJankMonitorWrapper;

		import android.animation.AnimatorSet;
		import android.animation.ValueAnimator;
		import android.app.ActivityOptions;
		@@ -48,12 +47,14 @@ import com.android.quickstep.SysUINavigationMode;
		import com.android.quickstep.SysUINavigationMode.Mode;
		import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
		import com.android.quickstep.SystemUiProxy;
		import com.android.quickstep.TaskUtils;
		import com.android.quickstep.util.RemoteAnimationProvider;
		import com.android.quickstep.util.RemoteFadeOutAnimationListener;
		import com.android.quickstep.views.OverviewActionsView;
		import com.android.quickstep.views.RecentsView;
		import com.android.systemui.shared.system.ActivityManagerWrapper;
		import com.android.systemui.shared.system.ActivityOptionsCompat;
		import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
		import com.android.systemui.shared.system.RemoteAnimationTargetCompat;

		import java.util.stream.Stream;
		@@ -123,7 +124,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
		@Override
		protected void onUiChangedWhileSleeping() {
		// Remove the snapshot because the content view may have obvious changes.
		ActivityManagerWrapper.getInstance().invalidateHomeTaskSnapshot(this);
		UI_HELPER_EXECUTOR.execute(
		() -> ActivityManagerWrapper.getInstance().invalidateHomeTaskSnapshot(this));
		}

		@Override
		@@ -203,8 +205,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
		@Override
		protected void closeOpenViews(boolean animate) {
		super.closeOpenViews(animate);
		ActivityManagerWrapper.getInstance()
		.closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY);
		TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY);
		}

		@Override

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -74,10 +74,10 @@ import com.android.launcher3.util.UiThreadHelper.AsyncCommand;
		import com.android.quickstep.SysUINavigationMode;
		import com.android.quickstep.SysUINavigationMode.Mode;
		import com.android.quickstep.SystemUiProxy;
		import com.android.quickstep.TaskUtils;
		import com.android.quickstep.util.QuickstepOnboardingPrefs;
		import com.android.quickstep.views.RecentsView;
		import com.android.quickstep.views.TaskView;
		import com.android.systemui.shared.system.ActivityManagerWrapper;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		@@ -175,8 +175,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {

		@Override
		protected void showAllAppsFromIntent(boolean alreadyOnHome) {
		ActivityManagerWrapper.getInstance().closeSystemWindows(
		CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY);
		TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY);
		super.showAllAppsFromIntent(alreadyOnHome);
		}

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -49,11 +49,11 @@ import com.android.launcher3.states.StateAnimationConfig;
		import com.android.launcher3.testing.TestProtocol;
		import com.android.launcher3.touch.SingleAxisSwipeDetector;
		import com.android.launcher3.util.TouchController;
		import com.android.quickstep.TaskUtils;
		import com.android.quickstep.util.AnimatorControllerWithResistance;
		import com.android.quickstep.util.AssistantUtilities;
		import com.android.quickstep.util.OverviewToHomeAnim;
		import com.android.quickstep.views.RecentsView;
		import com.android.systemui.shared.system.ActivityManagerWrapper;

		/**
		* Handles swiping up on the nav bar to go home from launcher, e.g. overview or all apps.
		@@ -233,8 +233,7 @@ public class NavBarToHomeTouchController implements TouchController,
		AbstractFloatingView.closeAllOpenViews(mLauncher);
		// TODO: add to WW log
		}
		ActivityManagerWrapper.getInstance()
		.closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
		TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
		} else {
		// Quickly return to the state we came from (we didn't move far).
		ValueAnimator anim = mCurrentAnimation.getAnimationPlayer();

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -45,9 +45,9 @@ import com.android.launcher3.touch.SingleAxisSwipeDetector;
		import com.android.quickstep.SysUINavigationMode;
		import com.android.quickstep.SysUINavigationMode.Mode;
		import com.android.quickstep.SystemUiProxy;
		import com.android.quickstep.TaskUtils;
		import com.android.quickstep.views.RecentsView;
		import com.android.quickstep.views.TaskView;
		import com.android.systemui.shared.system.ActivityManagerWrapper;

		/**
		* Handles quick switching to a recent task from the home screen.
		@@ -92,8 +92,7 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll
		public void onDragStart(boolean start, float startDisplacement) {
		super.onDragStart(start, startDisplacement);
		mStartContainerType = LAUNCHER_STATE_BACKGROUND;
		ActivityManagerWrapper.getInstance()
		.closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
		TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
		}

		@Override

quickstep/src/com/android/quickstep/OverviewCommandHelper.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -65,16 +65,14 @@ public class OverviewCommandHelper {
		return;
		}

		ActivityManagerWrapper.getInstance()
		.closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
		TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
		MAIN_EXECUTOR.execute(new RecentsActivityCommand<>());
		}

		@BinderThread
		public void onOverviewShown(boolean triggeredFromAltTab) {
		if (triggeredFromAltTab) {
		ActivityManagerWrapper.getInstance()
		.closeSystemWindows(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
		TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_RECENTS);
		}
		MAIN_EXECUTOR.execute(new ShowRecentsCommand(triggeredFromAltTab));
		}