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

Merge "Revert "Finish HomepageActivity when it's not the root of a task and not singleTask."" into main

Browse Source
This commit is contained in:
Chris Antol
2024-02-28 23:20:13 +00:00
committed by Android (Google) Code Review
parent d1b7f58e9a 778bcee157
commit 3711945eb2
2 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
View File

@@ -29,7 +29,6 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -223,28 +222,6 @@ public class SettingsHomepageActivityTest {
& SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS).isEqualTo(0);
}
@Test
public void onCreate_notTaskRoot_shouldFinishActivity() {
SettingsHomepageActivity activity =
spy(Robolectric.buildActivity(SettingsHomepageActivity.class).get());
doReturn(false).when(activity).isTaskRoot();
activity.onCreate(/* savedInstanceState */ null);
verify(activity).finish();
}
@Test
public void onCreate_singleTaskActivity_shouldNotFinishActivity() {
SettingsHomepageActivity activity =
spy(Robolectric.buildActivity(DeepLinkHomepageActivity.class).get());
doReturn(false).when(activity).isTaskRoot();
activity.onCreate(/* savedInstanceState */ null);
verify(activity, never()).finish();
}
/** This test is for large screen devices Activity embedding. */
@Test
@Config(shadows = ShadowActivityEmbeddingUtils.class)