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

Cleanup enableUseTopVisibleActivityForExcludeFromRecentTask flag

Browse Source 
Fix: 342627272
Flag: com.android.launcher3.enable_use_top_visible_activity_for_exclude_from_recent_task
Test: TaplTestsQuickstep
Change-Id: I3217869ec6f9c623c55c2504607b386020da7292
This commit is contained in:
Uwais Ashraf
2025-01-15 08:21:48 +00:00
parent e3b4b66d79
commit 5b13bb4adb
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+2 -8
View File
@@ -50,7 +50,6 @@ import com.android.launcher3.tapl.Workspace;
import com.android.launcher3.ui.PortraitLandscapeRunner.PortraitLandscape;
import com.android.launcher3.util.TestUtil;
import com.android.launcher3.util.Wait;
import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;
import com.android.launcher3.util.rule.TestStabilityRule;
import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
import com.android.quickstep.TaskbarModeSwitchRule.TaskbarModeSwitch;
@@ -584,19 +583,14 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
public void testExcludeFromRecents() throws Exception {
startExcludeFromRecentsTestActivity();
OverviewTask currentTask = getAndAssertLaunchedApp().switchToOverview().getCurrentTask();
// TODO(b/342627272): the expected content description shouldn't be null but for now there
// is a bug that causes it to sometimes be for excludeForRecents tasks.
assertTrue("Can't find ExcludeFromRecentsTestActivity after entering Overview from it",
currentTask.containsContentDescription("ExcludeFromRecents")
|| currentTask.containsContentDescription(null));
currentTask.containsContentDescription("ExcludeFromRecents"));
// Going home should clear out the excludeFromRecents task.
BaseOverview overview = mLauncher.goHome().switchToOverview();
if (overview.hasTasks()) {
currentTask = overview.getCurrentTask();
assertFalse("Found ExcludeFromRecentsTestActivity after entering Overview from Home",
currentTask.containsContentDescription(
"ExcludeFromRecents")
|| currentTask.containsContentDescription(null));
currentTask.containsContentDescription("ExcludeFromRecents"));
} else {
// Presumably the test started with 0 tasks and remains that way after going home.
}
tests/tapl/com/android/launcher3/tapl/OverviewTask.java
+2 -5
View File
@@ -24,7 +24,6 @@ import static com.android.launcher3.tapl.OverviewTask.OverviewTaskContainer.SPLI
import android.graphics.Rect;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.test.uiautomator.By;
import androidx.test.uiautomator.BySelector;
import androidx.test.uiautomator.UiObject2;
@@ -281,10 +280,8 @@ public final class OverviewTask {
/**
* Returns whether the given String is contained in this Task's contentDescription. Also returns
* true if both Strings are null.
*
* TODO(b/342627272): remove Nullable support once the bug causing it to be null is fixed.
*/
public boolean containsContentDescription(@Nullable String expected,
public boolean containsContentDescription(String expected,
OverviewTaskContainer overviewTaskContainer) {
String actual = findObjectInTask(overviewTaskContainer.snapshotRes).getContentDescription();
if (actual == null && expected == null) {
@@ -300,7 +297,7 @@ public final class OverviewTask {
* Returns whether the given String is contained in this Task's contentDescription. Also returns
* true if both Strings are null
*/
public boolean containsContentDescription(@Nullable String expected) {
public boolean containsContentDescription(String expected) {
return containsContentDescription(expected, DEFAULT);
}