PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes BinderTests when enable shell transition."

Browse Source
This commit is contained in:
Wei Sheng Shih
2021-12-03 02:56:24 +00:00
committed by Android (Google) Code Review
parent 331e6e94f9 aa79e68759
commit 3cc4bedd54
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/TaskAnimationManager.java
+1 -1
View File
@@ -184,7 +184,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn
mCtx.getIApplicationThread());
Bundle options = ActivityOptionsCompat.makeRemoteTransition(transition)
.setTransientLaunch().toBundle();
mCtx.startActivity(intent, options);
UI_HELPER_EXECUTOR.execute(() -> mCtx.startActivity(intent, options));
} else {
UI_HELPER_EXECUTOR.execute(() -> ActivityManagerWrapper.getInstance()
.startRecentsActivity(intent, eventTime, mCallbacks, null, null));
quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
+6 -2
View File
@@ -20,6 +20,8 @@ import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TI
import static org.junit.Assert.assertTrue;
import android.os.SystemProperties;
import com.android.launcher3.Launcher;
import com.android.launcher3.tapl.LauncherInstrumentation;
import com.android.launcher3.tapl.LauncherInstrumentation.ContainerType;
@@ -33,6 +35,8 @@ import org.junit.rules.TestRule;
* Base class for all instrumentation tests that deal with Quickstep.
*/
public abstract class AbstractQuickStepTest extends AbstractLauncherUiTest {
static final boolean ENABLE_SHELL_TRANSITIONS =
SystemProperties.getBoolean("persist.debug.shell_transit", false);
@Override
protected TestRule getRulesInsideActivityMonitor() {
return RuleChain.
@@ -51,7 +55,7 @@ public abstract class AbstractQuickStepTest extends AbstractLauncherUiTest {
@Override
protected void checkLauncherState(Launcher launcher, ContainerType expectedContainerType,
boolean isResumed, boolean isStarted) {
if (!isInLiveTileMode(launcher, expectedContainerType)) {
if (ENABLE_SHELL_TRANSITIONS || !isInLiveTileMode(launcher, expectedContainerType)) {
super.checkLauncherState(launcher, expectedContainerType, isResumed, isStarted);
} else {
assertTrue("[Live Tile] hasBeenResumed() == isStarted(), hasBeenResumed(): "
@@ -62,7 +66,7 @@ public abstract class AbstractQuickStepTest extends AbstractLauncherUiTest {
@Override
protected void checkLauncherStateInOverview(Launcher launcher,
ContainerType expectedContainerType, boolean isStarted, boolean isResumed) {
if (!isInLiveTileMode(launcher, expectedContainerType)) {
if (ENABLE_SHELL_TRANSITIONS || !isInLiveTileMode(launcher, expectedContainerType)) {
super.checkLauncherStateInOverview(launcher, expectedContainerType, isStarted,
isResumed);
} else {