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

Merge "Apply sliding transition to trust agent." into sc-dev am: fffda8de08 am: 6907efdb72 am: eadbf50bc4

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14786716

Change-Id: I4a7c4f244b82affe3281363ae7f230172a5c5334
This commit is contained in:
TreeHugger Robot
2021-06-02 07:22:55 +00:00
committed by Automerger Merge Worker
parent c2af625d7c eadbf50bc4
commit 978ce53b58
4 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java
View File

@@ -50,7 +50,6 @@ import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowUtils.class)
public class SubSettingLauncherTest {
@Mock
@@ -117,7 +116,6 @@ public class SubSettingLauncherTest {
@Test
public void launch_hasRequestListener_shouldStartActivityForResult() {
ShadowUtils.setIsPageTransitionEnabled(true);
final int requestCode = 123123;
when(mFragment.getActivity()).thenReturn(mActivity);