Merge "Revert transition codes from the base activity" into sc-dev am: 20faa89e15 am: 8d72155a07

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

Change-Id: I813c2f7fe3918109719992302f908f6d17ae30d0

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

@@ -28,14 +28,12 @@ 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 com.android.settingslib.transition.SettingsTransitionHelper;
 
@@ -45,7 +43,6 @@ 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;
 

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

@@ -47,7 +47,6 @@ public class ShadowUtils {
     private static boolean sIsVoiceCapable;
     private static ArraySet<String> sResultLinks = new ArraySet<>();
     private static boolean sIsBatteryPresent;
-    private static boolean sIsPageTransitionEnabled;
     private static boolean sIsMultipleBiometricsSupported;
 
     @Implementation
@@ -71,7 +70,6 @@ public class ShadowUtils {
         sIsVoiceCapable = false;
         sResultLinks = new ArraySet<>();
         sIsBatteryPresent = true;
-        sIsPageTransitionEnabled = true;
         sIsMultipleBiometricsSupported = false;
     }
 
@@ -171,15 +169,6 @@ public class ShadowUtils {
         sIsBatteryPresent = isBatteryPresent;
     }
 
-    @Implementation
-    protected static boolean isPageTransitionEnabled(Context context) {
-        return sIsPageTransitionEnabled;
-    }
-
-    public static void setIsPageTransitionEnabled(boolean isPageTransitionEnabled) {
-        sIsPageTransitionEnabled = isPageTransitionEnabled;
-    }
-
     @Implementation
     protected static boolean isMultipleBiometricsSupported(Context context) {
         return sIsMultipleBiometricsSupported;