Merge "Apply settings page transition" into sc-dev

tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java

@@ -28,12 +28,14 @@ import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.Bundle;
 import android.os.UserHandle;
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.SettingsActivity;
+import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 import org.junit.Before;
@@ -42,10 +44,12 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowUtils.class)
 public class SubSettingLauncherTest {
 
     @Mock
@@ -109,10 +113,13 @@ public class SubSettingLauncherTest {
 
     @Test
     public void launch_hasRequestListener_shouldStartActivityForResult() {
+        ShadowUtils.setIsPageTransitionEnabled(true);
         final int requestCode = 123123;
         when(mFragment.getActivity()).thenReturn(mActivity);
 
         final SubSettingLauncher launcher = spy(new SubSettingLauncher(mContext));
+        doNothing().when(launcher).launchForResult(any(Fragment.class), any(Intent.class),
+                anyInt());
         launcher.setTitleText("123")
                 .setDestination(SubSettingLauncherTest.class.getName())
                 .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
@@ -120,7 +127,8 @@ public class SubSettingLauncherTest {
                 .setResultListener(mFragment, requestCode)
                 .launch();
 
-        verify(mFragment).startActivityForResult(any(Intent.class), eq(requestCode));
+        verify(launcher)
+                .launchForResult(eq(mFragment), any(Intent.class), eq(requestCode));
     }
 
     @Test

tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java

@@ -39,6 +39,7 @@ import com.android.settings.core.HideNonSystemOverlayMixin;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
 import com.android.settings.homepage.contextualcards.slices.BatteryFixSliceTest;
 import com.android.settings.testutils.shadow.ShadowUserManager;
+import com.android.settings.testutils.shadow.ShadowUtils;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -58,12 +59,13 @@ import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowUserManager.class,
-        SettingsHomepageActivityTest.ShadowSuggestionFeatureProviderImpl.class})
+        SettingsHomepageActivityTest.ShadowSuggestionFeatureProviderImpl.class, ShadowUtils.class})
 public class SettingsHomepageActivityTest {
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        ShadowUtils.setIsPageTransitionEnabled(false);
     }
 
     @Test

tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java

@@ -47,6 +47,7 @@ public class ShadowUtils {
     private static boolean sIsVoiceCapable;
     private static ArraySet<String> sResultLinks = new ArraySet<>();
     private static boolean sIsBatteryPresent;
+    private static boolean sIsPageTransitionEnabled;
 
     @Implementation
     protected static int enforceSameOwner(Context context, int userId) {
@@ -69,6 +70,7 @@ public class ShadowUtils {
         sIsVoiceCapable = false;
         sResultLinks = new ArraySet<>();
         sIsBatteryPresent = true;
+        sIsPageTransitionEnabled = true;
     }
 
     public static void setIsDemoUser(boolean isDemoUser) {
@@ -166,4 +168,13 @@ public class ShadowUtils {
     public static void setIsBatteryPresent(boolean isBatteryPresent) {
         sIsBatteryPresent = isBatteryPresent;
     }
+
+    @Implementation
+    protected static boolean isPageTransitionEnabled(Context context) {
+        return sIsPageTransitionEnabled;
+    }
+
+    public static void setIsPageTransitionEnabled(boolean isPageTransitionEnabled) {
+        sIsPageTransitionEnabled = isPageTransitionEnabled;
+    }
 }