Use binary resource support in robolectric

The resources available to tests are now exactly the merged resources
located in the APK under test.

Bug: 74359828
Test: make -j56 RunSettingsRoboTests
Change-Id: I050db81a92decefea23314b5ec7a62f77ff4bb2b

tests/robotests/Android.mk

@@ -1,10 +1,68 @@
-#############################################
-# Settings Robolectric test target.         #
-#############################################
 LOCAL_PATH := $(call my-dir)
+
+SETTINGS_AOSP_PATH := packages/apps/Settings
+
+#############################################################
+# Build SettingsTest.apk which includes test-only resources.#
+#############################################################
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := SettingsTest
+LOCAL_PRIVATE_PLATFORM_APIS := true
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_MODULE_TAGS := optional
+LOCAL_USE_AAPT2 := true
+
+RELATIVE_SETTINGS_AOSP_PATH := ../../../../../$(SETTINGS_AOSP_PATH)
+
+LOCAL_MANIFEST_FILE := $(RELATIVE_SETTINGS_AOSP_PATH)/AndroidManifest.xml
+
+LOCAL_SRC_FILES := $(call all-java-files-under, $(RELATIVE_SETTINGS_AOSP_PATH)/src)
+
+LOCAL_RESOURCE_DIR += \
+	$(LOCAL_PATH)/res \
+	$(SETTINGS_AOSP_PATH)/res
+
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+    androidx.slice_slice-builders \
+    androidx.slice_slice-core \
+    androidx.slice_slice-view \
+    androidx.core_core \
+    androidx.appcompat_appcompat \
+    androidx.cardview_cardview \
+    androidx.preference_preference \
+    androidx.recyclerview_recyclerview \
+    com.google.android.material_material \
+    setupcompat \
+    setupdesign
+
+LOCAL_JAVA_LIBRARIES := \
+    telephony-common \
+    ims-common
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    androidx.lifecycle_lifecycle-runtime \
+    androidx.lifecycle_lifecycle-extensions \
+    guava \
+    jsr305 \
+    settings-contextual-card-protos-lite \
+    contextualcards \
+    settings-logtags \
+    zxing-core-1.7
+
+include frameworks/base/packages/SettingsLib/common.mk
+include frameworks/base/packages/SettingsLib/search/common.mk
+
+include $(BUILD_PACKAGE)
+
+#############################################################
+# Settings Robolectric test target.                         #
+#############################################################
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := SettingsRoboTests
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
     $(call all-java-files-under, ../../../../../frameworks/base/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils)
@@ -17,10 +75,13 @@ LOCAL_JAVA_LIBRARIES := \
     mockito-robolectric-prebuilt \
     truth-prebuilt
 
-LOCAL_INSTRUMENTATION_FOR := Settings
+LOCAL_INSTRUMENTATION_FOR := SettingsTest
 
 LOCAL_MODULE_TAGS := optional
 
+# Generate test_config.properties
+include external/robolectric-shadows/gen_test_config.mk
+
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
 #############################################################
@@ -37,7 +98,7 @@ LOCAL_JAVA_LIBRARIES := \
     mockito-robolectric-prebuilt \
     truth-prebuilt
 
-LOCAL_TEST_PACKAGE := Settings
+LOCAL_TEST_PACKAGE := SettingsTest
 
 LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src \
     frameworks/base/packages/SettingsLib/search/src \

tests/robotests/config/robolectric.properties

@@ -1,6 +1,3 @@
-manifest=packages/apps/Settings/AndroidManifest.xml
 sdk=NEWEST_SDK
-
 shadows=\
-   com.android.settings.testutils.shadow.ShadowThreadUtils,\
-   com.android.settingslib.testutils.shadow.ShadowXmlUtils
+   com.android.settings.testutils.shadow.ShadowThreadUtils

tests/robotests/res/values-mcc998/config.xml

@@ -0,0 +1,20 @@
+<!--
+  Copyright (C) 2018 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<resources>
+    <!-- List of packages that should be whitelisted for slice uri access. Do not translate -->
+    <string-array name="slice_whitelist_package_names" translatable="false"/>
+</resources>

tests/robotests/src/com/android/settings/DisplaySettingsTest.java

@@ -4,20 +4,20 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.ShadowPowerManager;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class DisplaySettingsTest {
 
     @Test

tests/robotests/src/com/android/settings/HelpTrampolineTest.java

@@ -20,19 +20,19 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Intent;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowHelpUtils;
 
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowActivity;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowHelpUtils.class)
 public class HelpTrampolineTest {
 

tests/robotests/src/com/android/settings/LegalSettingsTest.java

@@ -19,18 +19,18 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class LegalSettingsTest {
 
     @Before

tests/robotests/src/com/android/settings/MasterClearTest.java

@@ -50,7 +50,6 @@ import android.widget.ScrollView;
 
 import androidx.fragment.app.FragmentActivity;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowUtils;
 
 import org.junit.Before;
@@ -60,11 +59,12 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowActivity;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowUtils.class)
 public class MasterClearTest {
 

tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java

@@ -22,7 +22,6 @@ import static org.mockito.Mockito.spy;
 
 import android.app.Activity;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowRecoverySystem;
 import com.android.settings.testutils.shadow.ShadowWifiP2pManager;
 
@@ -33,9 +32,10 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowRecoverySystem.class, ShadowWifiP2pManager.class})
 public class ResetNetworkConfirmTest {
 
@@ -64,8 +64,7 @@ public class ResetNetworkConfirmTest {
         Robolectric.getBackgroundThreadScheduler().advanceToLastPostedRunnable();
 
         assertThat(mResetNetworkConfirm.mEraseEsimTask).isNotNull();
-        assertThat(ShadowRecoverySystem.getWipeEuiccCalledCount())
-                .isEqualTo(1);
+        assertThat(ShadowRecoverySystem.getWipeEuiccCalledCount()).isEqualTo(1);
     }
 
     @Test
@@ -75,8 +74,7 @@ public class ResetNetworkConfirmTest {
         mResetNetworkConfirm.esimFactoryReset(mActivity, "" /* packageName */);
 
         assertThat(mResetNetworkConfirm.mEraseEsimTask).isNull();
-        assertThat(ShadowRecoverySystem.getWipeEuiccCalledCount())
-                .isEqualTo(0);
+        assertThat(ShadowRecoverySystem.getWipeEuiccCalledCount()).isEqualTo(0);
     }
 
     /**
@@ -84,10 +82,8 @@ public class ResetNetworkConfirmTest {
      */
     @Test
     public void testResetNetworkData_resetP2p() {
-
         mResetNetworkConfirm.p2pFactoryReset(mActivity);
 
-        assertThat(ShadowWifiP2pManager.getFactoryResetCount())
-                .isEqualTo(1);
+        assertThat(ShadowWifiP2pManager.getFactoryResetCount()).isEqualTo(1);
     }
 }

tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java

@@ -29,7 +29,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.util.AttributeSet;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settingslib.RestrictedPreferenceHelper;
 
@@ -37,17 +36,14 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowKeyguardManager;
 import org.robolectric.util.ReflectionHelpers;
 
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        shadows = {
-                ShadowUserManager.class,
-                ShadowKeyguardManager.class,
-        })
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowUserManager.class, ShadowKeyguardManager.class})
 public class RestrictedListPreferenceTest {
     private static final int PROFILE_USER_ID = 11;
     // From UnlaunchableAppActivity
@@ -67,7 +63,9 @@ public class RestrictedListPreferenceTest {
                 Shadows.shadowOf(application.getSystemService(KeyguardManager.class));
         mMockHelper = mock(RestrictedPreferenceHelper.class);
         mShadowUserManager = ShadowUserManager.getShadow();
-        mPreference = new RestrictedListPreference(mActivity, mock(AttributeSet.class));
+
+        AttributeSet attributeSet = Robolectric.buildAttributeSet().build();
+        mPreference = new RestrictedListPreference(mActivity, attributeSet);
         mPreference.setProfileUserId(PROFILE_USER_ID);
         ReflectionHelpers.setField(mPreference, "mHelper", mMockHelper);
     }

tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java

@@ -24,15 +24,14 @@ import android.app.Activity;
 
 import androidx.appcompat.app.AlertDialog;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class RestrictedSettingsFragmentTest {
 
     @Mock

tests/robotests/src/com/android/settings/SettingsActivityTest.java

@@ -34,19 +34,19 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
 import com.android.settings.core.OnActivityResultListener;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class SettingsActivityTest {
 
     @Mock
@@ -99,7 +99,7 @@ public class SettingsActivityTest {
 
     public static class ListenerFragment extends Fragment implements OnActivityResultListener {
 
-        public boolean mOnActivityResultCalled;
+        private boolean mOnActivityResultCalled;
 
         @Override
         public void onActivityResult(int requestCode, int resultCode, Intent data) {

tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java

@@ -24,16 +24,15 @@ import android.app.Dialog;
 
 import androidx.fragment.app.Fragment;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class SettingsDialogFragmentTest {
 
     private static final int DIALOG_ID = 15;
@@ -72,7 +71,6 @@ public class SettingsDialogFragmentTest {
         } catch (IllegalStateException e) {
             // getDialogMetricsCategory called in constructor
             verify(mDialogCreatable).getDialogMetricsCategory(DIALOG_ID);
-            return;
         }
     }
 

tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java

@@ -17,8 +17,8 @@ package com.android.settings;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
@@ -32,7 +32,6 @@ import android.content.pm.ResolveInfo;
 import androidx.annotation.NonNull;
 
 import com.android.settings.fuelgauge.batterytip.AnomalyConfigJobService;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -41,12 +40,13 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 import java.io.OutputStream;
 import java.io.PrintWriter;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class SettingsDumpServiceTest {
 
     private static final String PACKAGE_BROWSER = "com.android.test.browser";

tests/robotests/src/com/android/settings/SettingsInitializeTest.java

@@ -22,25 +22,24 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ShortcutInfo;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowShortcutManager;
+import android.content.pm.ShortcutManager;
 
+import java.util.Collections;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 
-import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = {ShadowShortcutManager.class})
+@RunWith(RobolectricTestRunner.class)
 public class SettingsInitializeTest {
 
     private Context mContext;
     private SettingsInitialize mSettingsInitialize;
+    private ShortcutManager mShortcutManager;
 
     @Before
     public void setUp() {
@@ -48,6 +47,7 @@ public class SettingsInitializeTest {
 
         mContext = RuntimeEnvironment.application;
         mSettingsInitialize = new SettingsInitialize();
+        mShortcutManager = (ShortcutManager) mContext.getSystemService(Context.SHORTCUT_SERVICE);
     }
 
     @Test
@@ -59,14 +59,13 @@ public class SettingsInitializeTest {
                 .setShortLabel("test123")
                 .setIntent(intent)
                 .build();
-        final List<ShortcutInfo> shortcuts = new ArrayList<>();
-        shortcuts.add(info);
-        ShadowShortcutManager.get().setPinnedShortcuts(shortcuts);
+
+        mShortcutManager.addDynamicShortcuts(Collections.singletonList(info));
+        mShortcutManager.requestPinShortcut(info, null);
 
         mSettingsInitialize.refreshExistingShortcuts(mContext);
 
-        final List<ShortcutInfo> updatedShortcuts =
-                ShadowShortcutManager.get().getLastUpdatedShortcuts();
+        final List<ShortcutInfo> updatedShortcuts = mShortcutManager.getPinnedShortcuts();
         assertThat(updatedShortcuts).hasSize(1);
         final ShortcutInfo updateInfo = updatedShortcuts.get(0);
         assertThat(updateInfo.getId()).isEqualTo(id);
@@ -87,14 +86,14 @@ public class SettingsInitializeTest {
             .setIntent(new Intent(Intent.ACTION_DEFAULT))
             .build();
         info.addFlags(ShortcutInfo.FLAG_IMMUTABLE);
-        final List<ShortcutInfo> shortcuts = new ArrayList<>();
-        shortcuts.add(info);
-        ShadowShortcutManager.get().setPinnedShortcuts(shortcuts);
+
+        mShortcutManager.addDynamicShortcuts(Collections.singletonList(info));
+        mShortcutManager.requestPinShortcut(info, null);
 
         mSettingsInitialize.refreshExistingShortcuts(mContext);
 
-        final List<ShortcutInfo> updatedShortcuts =
-            ShadowShortcutManager.get().getLastUpdatedShortcuts();
-        assertThat(updatedShortcuts).isEmpty();
+        final List<ShortcutInfo> updatedShortcuts = mShortcutManager.getPinnedShortcuts();
+        assertThat(updatedShortcuts).hasSize(1);
+        assertThat(updatedShortcuts.get(0)).isSameAs(info);
     }
 }

tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java

@@ -18,7 +18,7 @@ package com.android.settings;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 
@@ -27,20 +27,19 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.SystemProperties;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.android.controller.ActivityController;
 
 import java.io.File;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class SettingsLicenseActivityTest {
 
     private ActivityController<SettingsLicenseActivity> mActivityController;

tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java

@@ -18,7 +18,7 @@ package com.android.settings;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -37,8 +37,6 @@ import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.widget.WorkOnlyCategory;
 
 import org.junit.Before;
@@ -46,11 +44,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class SettingsPreferenceFragmentTest {
 
     private static final int ITEM_COUNT = 5;
@@ -149,7 +147,6 @@ public class SettingsPreferenceFragmentTest {
     }
 
     @Test
-    @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
     public void onCreate_hasExtraFragmentKey_shouldExpandPreferences() {
         doReturn(mContext.getTheme()).when(mActivity).getTheme();
         doReturn(mContext.getResources()).when(mFragment).getResources();
@@ -164,7 +161,6 @@ public class SettingsPreferenceFragmentTest {
     }
 
     @Test
-    @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
     public void onCreate_noPreferenceScreen_shouldNotCrash() {
         doReturn(mContext.getTheme()).when(mActivity).getTheme();
         doReturn(mContext.getResources()).when(mFragment).getResources();

tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java

@@ -28,8 +28,9 @@ import com.google.android.setupdesign.util.ThemeHelper;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class SetupWizardUtilsTest {
 
     @Test

tests/robotests/src/com/android/settings/SummaryPreferenceTest.java

@@ -25,17 +25,13 @@ import android.widget.TextView;
 
 import androidx.preference.PreferenceViewHolder;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = SettingsShadowResourcesImpl.class)
+@RunWith(RobolectricTestRunner.class)
 public class SummaryPreferenceTest {
 
     private PreferenceViewHolder mHolder;

tests/robotests/src/com/android/settings/TetherSettingsTest.java

@@ -27,19 +27,18 @@ import android.net.ConnectivityManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class TetherSettingsTest {
 
     private Context mContext;
@@ -61,8 +60,8 @@ public class TetherSettingsTest {
 
         setupIsTetherAvailable(true);
 
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[]{});
-        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{});
+        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[0]);
+        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]);
     }
 
     @Test
@@ -91,7 +90,7 @@ public class TetherSettingsTest {
 
     @Test
     public void testTetherNonIndexableKeys_usbNotAvailable_usbKeyReturned() {
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[]{});
+        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[0]);
 
         final List<String> niks =
             TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
@@ -113,7 +112,7 @@ public class TetherSettingsTest {
 
     @Test
     public void testTetherNonIndexableKeys_bluetoothNotAvailable_bluetoothKeyReturned() {
-        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{});
+        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]);
 
         final List<String> niks =
             TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);

tests/robotests/src/com/android/settings/UtilsTest.java

@@ -19,8 +19,8 @@ package com.android.settings;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -48,20 +48,19 @@ import android.util.IconDrawableFactory;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class UtilsTest {
 
     private static final String PACKAGE_NAME = "com.android.app";

tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java

@@ -38,7 +38,7 @@ import android.content.IntentFilter;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.bluetooth.Utils;
 import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
 import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -47,6 +47,7 @@ import com.android.settingslib.bluetooth.HearingAidProfile;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -54,13 +55,14 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadow.api.Shadow;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowBluetoothAdapter.class, ShadowBluetoothUtils.class})
 public class AccessibilityHearingAidPreferenceControllerTest {
     private static final String TEST_DEVICE_ADDRESS = "00:A1:A1:A1:A1:A1";
@@ -100,6 +102,11 @@ public class AccessibilityHearingAidPreferenceControllerTest {
         mHearingAidPreference.setSummary("");
     }
 
+    @After
+    public void tearDown() {
+        ShadowBluetoothUtils.reset();
+    }
+
     @Test
     public void onHearingAidStateChanged_connected_updateHearingAidSummary() {
         when(mHearingAidProfile.getConnectedDevices()).thenReturn(generateHearingAidDeviceList());
@@ -175,7 +182,7 @@ public class AccessibilityHearingAidPreferenceControllerTest {
 
     private void setupBluetoothEnvironment() {
         ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;
-        mLocalBluetoothManager = ShadowBluetoothUtils.getLocalBtManager(mContext);
+        mLocalBluetoothManager = Utils.getLocalBtManager(mContext);
         mBluetoothManager = new BluetoothManager(mContext);
         mBluetoothAdapter = mBluetoothManager.getAdapter();
         when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager);
@@ -197,8 +204,7 @@ public class AccessibilityHearingAidPreferenceControllerTest {
     private void sendIntent(Intent intent) {
         ArgumentCaptor<BroadcastReceiver> broadcastReceiverCaptor =
                 ArgumentCaptor.forClass(BroadcastReceiver.class);
-        verify(mContext).registerReceiver(
-                broadcastReceiverCaptor.capture(), (IntentFilter) any());
+        verify(mContext).registerReceiver(broadcastReceiverCaptor.capture(), any());
         BroadcastReceiver br = broadcastReceiverCaptor.getValue();
         br.onReceive(mContext, intent);
     }

tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java

@@ -29,19 +29,18 @@ import android.provider.Settings;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AccessibilitySettingsTest {
     private static final String VIBRATION_PREFERENCE_SCREEN = "vibration_preference_screen";
     private static final String ACCESSIBILITY_CONTENT_TIMEOUT_PREFERENCE =
@@ -66,20 +65,19 @@ public class AccessibilitySettingsTest {
     public void testNonIndexableKeys_existInXmlLayout() {
         final List<String> niks = AccessibilitySettings.SEARCH_INDEX_DATA_PROVIDER
             .getNonIndexableKeys(mContext);
-        final List<String> keys = new ArrayList<>();
-
-        keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_settings));
+        final List<String> keys =
+            XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_settings);
 
         assertThat(keys).containsAllIn(niks);
     }
 
     @Test
     public void testUpdateVibrationSummary_shouldUpdateSummary() {
-        final Preference mVibrationPreferenceScreen = new Preference(mContext);
-        doReturn(mVibrationPreferenceScreen).when(mSettings).findPreference(
+        final Preference vibrationPreferenceScreen = new Preference(mContext);
+        doReturn(vibrationPreferenceScreen).when(mSettings).findPreference(
                 VIBRATION_PREFERENCE_SCREEN);
 
-        mVibrationPreferenceScreen.setKey(VIBRATION_PREFERENCE_SCREEN);
+        vibrationPreferenceScreen.setKey(VIBRATION_PREFERENCE_SCREEN);
 
         Settings.System.putInt(mContext.getContentResolver(),
                 Settings.System.NOTIFICATION_VIBRATION_INTENSITY,
@@ -89,8 +87,8 @@ public class AccessibilitySettingsTest {
                 Settings.System.HAPTIC_FEEDBACK_INTENSITY,
                 Vibrator.VIBRATION_INTENSITY_OFF);
 
-        mSettings.updateVibrationSummary(mVibrationPreferenceScreen);
-        assertThat(mVibrationPreferenceScreen.getSummary()).isEqualTo(
+        mSettings.updateVibrationSummary(vibrationPreferenceScreen);
+        assertThat(vibrationPreferenceScreen.getSummary()).isEqualTo(
                 VibrationIntensityPreferenceController.getIntensityString(mContext,
                         Vibrator.VIBRATION_INTENSITY_OFF));
     }

tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java

@@ -30,12 +30,12 @@ import android.content.pm.ServiceInfo;
 import android.provider.Settings;
 import android.view.accessibility.AccessibilityManager;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.accessibility.AccessibilityUtils;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowAccessibilityManager;
@@ -45,7 +45,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AccessibilitySlicePreferenceControllerTest {
 
     private final String PACKAGE_NAME = "com.android.settings.fake";

tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java

@@ -31,7 +31,6 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.widget.RadioButtonPreference;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
@@ -40,9 +39,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AccessibilityTimeoutControllerTest
         implements AccessibilityTimeoutController.OnChangeListener {
     private static final String PREF_KEY = "accessibility_content_timeout_30secs";
@@ -91,7 +91,7 @@ public class AccessibilityTimeoutControllerTest
 
         mController.updateState(mMockPref);
 
-        // the first checked state is seted to false by control
+        // the first checked state is set to false by control
         verify(mMockPref).setChecked(false);
         verify(mMockPref).setChecked(false);
     }
@@ -103,7 +103,7 @@ public class AccessibilityTimeoutControllerTest
 
         mController.updateState(mMockPref);
 
-        // the first checked state is seted to false by control
+        // the first checked state is set to false by control
         verify(mMockPref).setChecked(false);
         verify(mMockPref).setChecked(true);
     }

tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java

@@ -27,15 +27,15 @@ import android.provider.Settings;
 import androidx.preference.SwitchPreference;
 
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class ColorInversionPreferenceControllerTest {
     private static final int UNKNOWN = -1;
     private Context mContext;

tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java

@@ -23,16 +23,16 @@ import android.content.Context;
 import androidx.lifecycle.LifecycleOwner;
 
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class HapticFeedbackIntensityPreferenceControllerTest {
 
     private LifecycleOwner mLifecycleOwner;

tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java

@@ -28,15 +28,15 @@ import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class MagnificationGesturesPreferenceControllerTest {
 
     private Context mContext;

tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java

@@ -31,20 +31,20 @@ import android.provider.Settings;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.annotation.Resetter;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class MagnificationNavbarPreferenceControllerTest {
 
     private Context mContext;

tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java

@@ -34,7 +34,6 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
@@ -42,9 +41,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class NotificationVibrationIntensityPreferenceControllerTest {
 
     @Mock

tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java

@@ -27,7 +27,6 @@ import android.content.Context;
 import android.os.UserManager;
 
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -35,9 +34,10 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class ShortcutServicePickerFragmentTest {
 
     private static final String TEST_SERVICE_KEY_1 = "abc/123";
@@ -56,7 +56,7 @@ public class ShortcutServicePickerFragmentTest {
         when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
 
         mFragment = spy(new ShortcutServicePickerFragment());
-        mFragment.onAttach((Context) mActivity);
+        mFragment.onAttach(mActivity);
 
         doReturn(RuntimeEnvironment.application).when(mFragment).getContext();
     }

tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java

@@ -29,17 +29,14 @@ import androidx.annotation.XmlRes;
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.widget.SwitchBar;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.shadows.androidx.fragment.FragmentController;
 
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
+@RunWith(RobolectricTestRunner.class)
 public class ToggleFeaturePreferenceFragmentTest {
 
     private ToggleFeaturePreferenceFragmentTestable mFragment;

tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java

@@ -37,7 +37,6 @@ import com.android.settings.R;
 import com.android.settings.accessibility.VibrationPreferenceFragment
         .VibrationIntensityCandidateInfo;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.widget.CandidateInfo;
 
 import org.junit.Before;
@@ -45,13 +44,14 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class VibrationPreferenceFragmentTest {
 
     private static final Map<Integer, String> INTENSITY_TO_KEY = new HashMap<>(4);

tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java

@@ -19,17 +19,17 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.provider.SearchIndexableResource;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.drawer.CategoryKey;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AccountDashboardFragmentTest {
 
     private AccountDashboardFragment mFragment;
@@ -53,6 +53,4 @@ public class AccountDashboardFragmentTest {
         assertThat(indexRes).isNotNull();
         assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
     }
-
-
 }

tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java

@@ -20,8 +20,8 @@ import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_TITL
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -29,13 +29,11 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.accounts.Account;
-import android.accounts.AccountManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -45,7 +43,6 @@ import androidx.preference.Preference;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.dashboard.DashboardFeatureProviderImpl;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowAccountManager;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settingslib.drawer.CategoryKey;
@@ -56,13 +53,14 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadow.api.Shadow;
 import org.robolectric.util.ReflectionHelpers;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowAccountManager.class, ShadowUserManager.class})
 public class AccountDetailDashboardFragmentTest {
 
@@ -164,13 +162,11 @@ public class AccountDetailDashboardFragmentTest {
 
     @Test
     public void onResume_accountMissing_shouldFinish() {
-        ShadowUserManager userManager = Shadow.extract(
-                mContext.getSystemService(UserManager.class));
-        ShadowAccountManager accountManager = Shadow.extract(
-                mContext.getSystemService(AccountManager.class));
+        ShadowUserManager userManager =
+            Shadow.extract(mContext.getSystemService(UserManager.class));
 
         userManager.addUserProfile(new UserHandle(1));
-        accountManager.addAccountForUser(1, new Account("test@test.com", "com.test"));
+        ShadowAccountManager.addAccountForUser(1, new Account("test@test.com", "com.test"));
 
         mFragment.finishIfAccountMissing();
         verify(mFragment).finish();
@@ -178,13 +174,11 @@ public class AccountDetailDashboardFragmentTest {
 
     @Test
     public void onResume_accountPresentOneProfile_shouldNotFinish() {
-        ShadowUserManager userManager = Shadow.extract(
-                mContext.getSystemService(UserManager.class));
-        ShadowAccountManager accountManager = Shadow.extract(
-                mContext.getSystemService(AccountManager.class));
+        ShadowUserManager userManager =
+            Shadow.extract(mContext.getSystemService(UserManager.class));
 
         userManager.addUserProfile(new UserHandle(1));
-        accountManager.addAccountForUser(1, mFragment.mAccount);
+        ShadowAccountManager.addAccountForUser(1, mFragment.mAccount);
 
         mFragment.finishIfAccountMissing();
         verify(mFragment, never()).finish();
@@ -192,15 +186,13 @@ public class AccountDetailDashboardFragmentTest {
 
     @Test
     public void onResume_accountPresentTwoProfiles_shouldNotFinish() {
-        ShadowUserManager userManager = Shadow.extract(
-                mContext.getSystemService(UserManager.class));
-        ShadowAccountManager accountManager = Shadow.extract(
-                mContext.getSystemService(AccountManager.class));
+        ShadowUserManager userManager =
+            Shadow.extract(mContext.getSystemService(UserManager.class));
 
         userManager.addUserProfile(new UserHandle(1));
         userManager.addUserProfile(new UserHandle(2));
-        accountManager.addAccountForUser(1, new Account("test@test.com", "com.test"));
-        accountManager.addAccountForUser(2, mFragment.mAccount);
+        ShadowAccountManager.addAccountForUser(1, new Account("test@test.com", "com.test"));
+        ShadowAccountManager.addAccountForUser(2, mFragment.mAccount);
 
         mFragment.finishIfAccountMissing();
         verify(mFragment, never()).finish();

tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java

@@ -20,7 +20,7 @@ import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.when;
 
@@ -36,7 +36,6 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.accounts.AuthenticatorHelper;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.widget.LayoutPreference;
@@ -46,12 +45,13 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = AccountHeaderPreferenceControllerTest.ShadowAuthenticatorHelper.class)
 public class AccountHeaderPreferenceControllerTest {
 
@@ -113,7 +113,7 @@ public class AccountHeaderPreferenceControllerTest {
     @Implements(AuthenticatorHelper.class)
     public static class ShadowAuthenticatorHelper {
         @Implementation
-        public void onAccountsUpdated(Account[] accounts) {
+        protected void onAccountsUpdated(Account[] accounts) {
 
         }
     }

tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java

@@ -18,10 +18,10 @@ package com.android.settings.accounts;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
@@ -34,8 +34,6 @@ import android.accounts.AccountManager;
 import android.accounts.AuthenticatorDescription;
 import android.content.Context;
 import android.content.pm.UserInfo;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.text.TextUtils;
@@ -49,27 +47,25 @@ import com.android.settings.AccessiblePreferenceCategory;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowAccountManager;
 import com.android.settings.testutils.shadow.ShadowContentResolver;
-import com.android.settingslib.accounts.AuthenticatorHelper;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
 import org.robolectric.shadows.ShadowApplication;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
 public class AccountPreferenceControllerTest {
 
@@ -103,6 +99,11 @@ public class AccountPreferenceControllerTest {
         mController = new AccountPreferenceController(mContext, mFragment, null, mAccountHelper);
     }
 
+    @After
+    public void tearDown() {
+        ShadowContentResolver.reset();
+    }
+
     @Test
     public void onResume_managedProfile_shouldNotAddAccountCategory() {
         when(mUserManager.isManagedProfile()).thenReturn(true);
@@ -216,7 +217,6 @@ public class AccountPreferenceControllerTest {
 
         verify(preferenceGroup).setTitle(
                 mContext.getString(R.string.account_for_section_header, "user 1"));
-
     }
 
     @Test
@@ -338,9 +338,10 @@ public class AccountPreferenceControllerTest {
         Account[] accounts = {new Account("Account1", "com.acct1")};
         when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(accounts);
 
-        Account[] accountType1 = new Account[2];
-        accountType1[0] = new Account("Account11", "com.acct1");
-        accountType1[1] = new Account("Account12", "com.acct1");
+        Account[] accountType1 = {
+            new Account("Account11", "com.acct1"),
+            new Account("Account12", "com.acct1")
+        };
         when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
                 .thenReturn(accountType1);
 
@@ -362,8 +363,7 @@ public class AccountPreferenceControllerTest {
     }
 
     @Test
-    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class,
-            ShadowAuthenticatorHelper.class})
+    @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
     public void onResume_twoAccountsOfSameName_shouldAddFivePreferences() {
         final List<UserInfo> infos = new ArrayList<>();
         infos.add(new UserInfo(1, "user 1", 0));
@@ -532,9 +532,10 @@ public class AccountPreferenceControllerTest {
         Account[] accounts = {new Account("Acct1", "com.acct1")};
         when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(accounts);
 
-        Account[] accountType1 = new Account[2];
-        accountType1[0] = new Account("Acct11", "com.acct1");
-        accountType1[1] = new Account("Acct12", "com.acct1");
+        Account[] accountType1 = {
+            new Account("Acct11", "com.acct1"),
+            new Account("Acct12", "com.acct1")
+        };
         when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
                 .thenReturn(accountType1);
 
@@ -552,8 +553,7 @@ public class AccountPreferenceControllerTest {
         mController.onResume();
 
         // remove an account
-        accountType1 = new Account[1];
-        accountType1[0] = new Account("Acct11", "com.acct1");
+        accountType1 = new Account[] {new Account("Acct11", "com.acct1")};
         when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
                 .thenReturn(accountType1);
 
@@ -606,12 +606,4 @@ public class AccountPreferenceControllerTest {
     private static ArgumentMatcher<Preference> titleMatches(String expected) {
         return preference -> TextUtils.equals(expected, preference.getTitle());
     }
-
-    @Implements(AuthenticatorHelper.class)
-    public static class ShadowAuthenticatorHelper {
-        @Implementation
-        public Drawable getDrawableForType(Context context, final String accountType) {
-            return new ColorDrawable();
-        }
-    }
 }

tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java

@@ -22,16 +22,16 @@ import static org.mockito.Mockito.verify;
 import android.accounts.Account;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AccountPreferenceTest {
 
     private AccountPreference mPreference;

tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java

@@ -18,7 +18,7 @@ package com.android.settings.accounts;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.when;
 
 import android.accounts.Account;
@@ -34,7 +34,6 @@ import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowAccountManager;
 import com.android.settings.testutils.shadow.ShadowContentResolver;
 
@@ -45,10 +44,11 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
 public class AccountSyncPreferenceControllerTest {
 

tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java

@@ -25,17 +25,17 @@ import android.os.UserHandle;
 
 import androidx.fragment.app.FragmentActivity;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowContentResolver;
 
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowContentResolver.class})
 public class AccountSyncSettingsTest {
 

tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java

@@ -17,7 +17,7 @@
 package com.android.settings.accounts;
 
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -36,21 +36,22 @@ import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowAccountManager;
 import com.android.settings.testutils.shadow.ShadowContentResolver;
 import com.android.settingslib.accounts.AuthenticatorHelper;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AccountTypePreferenceLoaderTest {
 
     @Mock(answer = RETURNS_DEEP_STUBS)
@@ -81,6 +82,11 @@ public class AccountTypePreferenceLoaderTest {
             UserHandle.CURRENT));
     }
 
+    @After
+    public void tearDown() {
+        ShadowContentResolver.reset();
+    }
+
     @Test
     @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
     public void updatePreferenceIntents_shouldRunRecursively() {

tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java

@@ -19,7 +19,7 @@ package com.android.settings.accounts;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -41,13 +41,13 @@ import android.widget.ImageView;
 
 import com.android.settings.homepage.SettingsHomepageActivity;
 import com.android.settings.homepage.contextualcards.slices.BatteryFixSliceTest;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
@@ -57,7 +57,7 @@ import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowContentResolver;
 import org.robolectric.shadows.ShadowPackageManager;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AvatarViewMixinTest {
     private static final String DUMMY_ACCOUNT = "test@domain.com";
     private static final String DUMMY_DOMAIN = "domain.com";
@@ -171,9 +171,8 @@ public class AvatarViewMixinTest {
     public static class ShadowAccountFeatureProviderImpl {
 
         @Implementation
-        public Account[] getAccounts(Context context) {
-            Account[] accounts = {new Account(DUMMY_ACCOUNT, DUMMY_DOMAIN)};
-            return accounts;
+        protected Account[] getAccounts(Context context) {
+            return new Account[] {new Account(DUMMY_ACCOUNT, DUMMY_DOMAIN)};
         }
     }
 }

tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java

@@ -18,7 +18,7 @@ package com.android.settings.accounts;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -38,7 +38,6 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowAccountManager;
 import com.android.settings.testutils.shadow.ShadowContentResolver;
 import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
@@ -49,10 +48,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class,
         ShadowRestrictedLockUtilsInternal.class})
 public class ChooseAccountPreferenceControllerTest {

tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java

@@ -27,7 +27,6 @@ import android.content.Context;
 import android.os.UserHandle;
 import android.provider.Settings;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import org.junit.Before;
@@ -35,9 +34,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class ContactSearchPreferenceControllerTest {
 
     private static final String PREF_KEY = "contacts_search";

tests/robotests/src/com/android/settings/accounts/CrossProfileCalendarPreferenceControllerTest.java

@@ -32,10 +32,7 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.os.UserHandle;
 import android.provider.Settings;
-import android.util.ArraySet;
-import android.util.Log;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import org.junit.Before;
@@ -43,15 +40,12 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowDevicePolicyManager;
 
-import java.util.Collections;
-import java.util.Set;
-
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class CrossProfileCalendarPreferenceControllerTest {
 
     private static final String PREF_KEY = "cross_profile_calendar";

tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java

@@ -18,8 +18,8 @@ package com.android.settings.accounts;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -37,24 +37,24 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowAccountManager;
 import com.android.settings.testutils.shadow.ShadowContentResolver;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class EmergencyInfoPreferenceControllerTest {
 
     @Mock(answer = RETURNS_DEEP_STUBS)
@@ -76,6 +76,11 @@ public class EmergencyInfoPreferenceControllerTest {
         when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
     }
 
+    @After
+    public void tearDown() {
+        ShadowContentResolver.reset();
+    }
+
     @Test
     public void updateRawDataToIndex_prefUnavailable_shouldNotUpdate() {
         final List<SearchIndexableRaw> data = new ArrayList<>();

tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java

@@ -27,16 +27,16 @@ import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.widget.FooterPreferenceMixinCompat;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class EnterpriseDisclosurePreferenceControllerTest {
 
     private static final String TEST_DISCLOSURE = "This is a test disclosure.";
@@ -48,7 +48,6 @@ public class EnterpriseDisclosurePreferenceControllerTest {
     private PreferenceManager mPreferenceManager;
     private PreferenceScreen mPreferenceScreen;
 
-
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);

tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java

@@ -22,15 +22,14 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.util.ReflectionHelpers;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class ProviderPreferenceTest {
 
     private Context mContext;

tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java

@@ -18,10 +18,10 @@ package com.android.settings.accounts;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -51,19 +51,20 @@ import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowAccountManager;
 import com.android.settings.testutils.shadow.ShadowContentResolver;
 import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settingslib.widget.LayoutPreference;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
@@ -72,7 +73,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = {
         ShadowUserManager.class,
         ShadowDevicePolicyManager.class
@@ -116,6 +117,11 @@ public class RemoveAccountPreferenceControllerTest {
                 mFragment);
     }
 
+    @After
+    public void tearDown() {
+        ShadowContentResolver.reset();
+    }
+
     @Test
     public void displayPreference_shouldAddClickListener() {
         when(mScreen.findPreference(KEY_REMOVE_ACCOUNT)).thenReturn(mPreference);

tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java

@@ -18,14 +18,13 @@ package com.android.settings.accounts;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.lang.reflect.Modifier;
+import org.robolectric.RobolectricTestRunner;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class RemoveUserFragmentTest {
 
     @Test

tests/robotests/src/com/android/settings/accounts/SyncStateSwitchPreferenceTest.java

@@ -22,14 +22,13 @@ import android.accounts.Account;
 import android.content.Context;
 import android.os.UserHandle;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class SyncStateSwitchPreferenceTest {
 
     private Context mContext;

tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java

@@ -28,20 +28,20 @@ import android.os.UserHandle;
 import android.text.TextUtils;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.accounts.AuthenticatorHelper;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.annotation.Resetter;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = {TopLevelAccountEntryPreferenceControllerTest.ShadowAuthenticationHelper.class})
 public class TopLevelAccountEntryPreferenceControllerTest {
 
@@ -91,7 +91,7 @@ public class TopLevelAccountEntryPreferenceControllerTest {
         static final String[] LABELS = {"LABEL1", "LABEL2", "LABEL3", "LABEL4"};
         private static String[] sEnabledAccount = TYPES;
 
-        public void __constructor__(Context context, UserHandle userHandle,
+        protected void __constructor__(Context context, UserHandle userHandle,
                 AuthenticatorHelper.OnAccountsUpdateListener listener) {
         }
 
@@ -105,12 +105,12 @@ public class TopLevelAccountEntryPreferenceControllerTest {
         }
 
         @Implementation
-        public String[] getEnabledAccountTypes() {
+        protected String[] getEnabledAccountTypes() {
             return sEnabledAccount;
         }
 
         @Implementation
-        public CharSequence getLabelForType(Context context, final String accountType) {
+        protected CharSequence getLabelForType(Context context, final String accountType) {
             if (TextUtils.equals(accountType, TYPES[0])) {
                 return LABELS[0];
             } else if (TextUtils.equals(accountType, TYPES[1])) {

tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java

@@ -30,16 +30,16 @@ import android.os.UserManager;
 import androidx.preference.SwitchPreference;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class WorkModePreferenceControllerTest {
 
     private static final String PREF_KEY = "work_mode";

tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java

@@ -18,7 +18,7 @@ package com.android.settings.applications;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -38,7 +38,6 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.applications.AppUtils;
@@ -53,11 +52,12 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowEntityHeaderController.class)
 public class AppInfoWithHeaderTest {
 

tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java

@@ -18,9 +18,9 @@ package com.android.settings.applications;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -35,19 +35,18 @@ import android.content.pm.PermissionInfo;
 
 import androidx.preference.Preference;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AppPermissionsPreferenceControllerTest {
 
     private static final String PERM_LOCATION = "android.permission-group.LOCATION";

tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java

@@ -16,8 +16,8 @@
 
 package com.android.settings.applications;
 
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
 
 import android.Manifest;
@@ -27,7 +27,6 @@ import android.content.pm.IPackageManager;
 import android.os.RemoteException;
 import android.os.UserManager;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
 import org.junit.Before;
@@ -35,8 +34,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public final class AppStateAppOpsBridgeTest {
 
     @Mock private Context mContext;
@@ -61,7 +61,7 @@ public final class AppStateAppOpsBridgeTest {
     }
 
     private class TestAppStateAppOpsBridge extends AppStateAppOpsBridge {
-        public TestAppStateAppOpsBridge() {
+        private TestAppStateAppOpsBridge() {
             super(mContext, null, null, AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
                 new String[] {Manifest.permission.SYSTEM_ALERT_WINDOW},
                 mPackageManagerService);

tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java

@@ -20,12 +20,11 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.app.AppOpsManager;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AppStateInstallAppsBridgeTest {
 
     @Test

tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java

@@ -31,9 +31,8 @@ import static com.android.settings.applications.AppStateNotificationBridge
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
@@ -59,7 +58,6 @@ import android.widget.Switch;
 import com.android.settings.R;
 import com.android.settings.applications.AppStateNotificationBridge.NotificationsSentState;
 import com.android.settings.notification.NotificationBackend;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
@@ -68,13 +66,14 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AppStateNotificationBridgeTest {
 
     private static String PKG1 = "pkg1";
@@ -151,7 +150,7 @@ public class AppStateNotificationBridgeTest {
                 .thenReturn(usageEvents);
 
         Map<String, NotificationsSentState> map = mBridge.getAggregatedUsageEvents();
-        assertThat(map.get(mBridge.getKey(0, PKG1)).sentCount).isEqualTo(1);
+        assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG1)).sentCount).isEqualTo(1);
     }
 
     @Test
@@ -173,8 +172,8 @@ public class AppStateNotificationBridgeTest {
                 .thenReturn(usageEvents);
 
         Map<String, NotificationsSentState> map  = mBridge.getAggregatedUsageEvents();
-        assertThat(map.get(mBridge.getKey(0, PKG1)).sentCount).isEqualTo(2);
-        assertThat(map.get(mBridge.getKey(0, PKG1)).lastSent).isEqualTo(6);
+        assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG1)).sentCount).isEqualTo(2);
+        assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG1)).lastSent).isEqualTo(6);
     }
 
     @Test
@@ -197,10 +196,10 @@ public class AppStateNotificationBridgeTest {
 
         Map<String, NotificationsSentState> map
                 = mBridge.getAggregatedUsageEvents();
-        assertThat(map.get(mBridge.getKey(0, PKG1)).sentCount).isEqualTo(1);
-        assertThat(map.get(mBridge.getKey(0, PKG2)).sentCount).isEqualTo(1);
-        assertThat(map.get(mBridge.getKey(0, PKG1)).lastSent).isEqualTo(6);
-        assertThat(map.get(mBridge.getKey(0, PKG2)).lastSent).isEqualTo(1);
+        assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG1)).sentCount).isEqualTo(1);
+        assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG2)).sentCount).isEqualTo(1);
+        assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG1)).lastSent).isEqualTo(6);
+        assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG2)).lastSent).isEqualTo(1);
     }
 
     @Test
@@ -419,6 +418,7 @@ public class AppStateNotificationBridgeTest {
         AppEntry allow = mock(AppEntry.class);
         allow.extraInfo = allowState;
 
+
         assertTrue(FILTER_APP_NOTIFICATION_RECENCY.filterApp(allow));
 
         NotificationsSentState denyState = new NotificationsSentState();
@@ -557,7 +557,7 @@ public class AppStateNotificationBridgeTest {
 
     @Test
     public void testSwitchViews_nullDoesNotCrash() {
-        mBridge.enableSwitch(null);
-        mBridge.checkSwitch(null);
+        AppStateNotificationBridge.enableSwitch(null);
+        AppStateNotificationBridge.checkSwitch(null);
     }
 }

tests/robotests/src/com/android/settings/applications/AppStorageSettingsTest.java

@@ -18,8 +18,8 @@ package com.android.settings.applications;
 
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -31,7 +31,6 @@ import android.content.Context;
 import android.view.View;
 import android.widget.Button;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
 import com.android.settingslib.widget.ActionButtonsPreference;
 
@@ -40,9 +39,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AppStorageSettingsTest {
 
     @Mock

tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java

@@ -10,16 +10,16 @@ import android.content.Context;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AppStorageSizesControllerTest {
 
     private static final String COMPUTING = "Computing…";

tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java

@@ -20,9 +20,9 @@ import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyObject;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -39,18 +39,18 @@ import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
+import java.util.Collections;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.shadows.ShadowApplication;
 
 import java.util.Arrays;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public final class AppWithAdminGrantedPermissionsCounterTest {
 
     private final String APP_1 = "app1";
@@ -221,7 +221,7 @@ public final class AppWithAdminGrantedPermissionsCounterTest {
         // granted both permissions by the admin. It should be counted.
         when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
                         | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS,
-                MANAGED_PROFILE_ID)).thenReturn(Arrays.asList(mApp6));
+                MANAGED_PROFILE_ID)).thenReturn(Collections.singletonList(mApp6));
 
         // app3 and app5 were installed by enterprise policy.
         final UserHandle mainUser = new UserHandle(MAIN_USER_ID);
@@ -239,7 +239,6 @@ public final class AppWithAdminGrantedPermissionsCounterTest {
         final UserHandle managedProfileUser = new UserHandle(MANAGED_PROFILE_ID);
         when(mPackageManager.getInstallReason(APP_6, managedProfileUser))
                 .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-
     }
 
     private void configureUserManager() {

tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java

@@ -20,9 +20,9 @@ import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyObject;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -36,20 +36,19 @@ import android.os.Build;
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.shadows.ShadowApplication;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public final class AppWithAdminGrantedPermissionsListerTest {
 
     private final String APP_1 = "app1";

tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java

@@ -36,7 +36,6 @@ import android.os.UserManager;
 
 import com.android.settings.R;
 import com.android.settings.testutils.ApplicationTestUtils;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.testutils.shadow.ShadowDefaultDialerManager;
 import com.android.settingslib.testutils.shadow.ShadowSmsApplication;
 
@@ -45,6 +44,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
@@ -58,7 +58,7 @@ import java.util.Set;
 /**
  * Tests for {@link ApplicationFeatureProviderImpl}.
  */
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public final class ApplicationFeatureProviderImplTest {
 
     private final int MAIN_USER_ID = 0;
@@ -109,8 +109,7 @@ public final class ApplicationFeatureProviderImplTest {
                 .thenReturn(PackageManager.INSTALL_REASON_POLICY);
 
         mAppCount = -1;
-        mProvider.calculateNumberOfPolicyInstalledApps(async,
-                (num) -> mAppCount = num);
+        mProvider.calculateNumberOfPolicyInstalledApps(async, (num) -> mAppCount = num);
         if (async) {
             ShadowApplication.runBackgroundTasks();
         }

tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java

@@ -18,9 +18,9 @@ package com.android.settings.applications;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -38,19 +38,19 @@ import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceCon
 import com.android.settings.applications.defaultapps.DefaultPhonePreferenceController;
 import com.android.settings.applications.defaultapps.DefaultSmsPreferenceController;
 import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.util.ReflectionHelpers;
 
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class DefaultAppSettingsTest {
 
     private Context mContext;
@@ -146,7 +146,6 @@ public class DefaultAppSettingsTest {
         summaryProvider.setListening(true);
 
         verify(summaryLoader, never()).setSummary(summaryProvider, eq(anyString()));
-
     }
 
     @Test

tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java

@@ -16,18 +16,18 @@
 
 package com.android.settings.applications;
 
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class EnterpriseDefaultAppsTest {
     @Test
-    public void testNumberOfIntentsCorrelateWithUI() throws Exception {
+    public void testNumberOfIntentsCorrelateWithUI() {
         final int concatenation_templates[] =
                 new int[]{0 /* no need for single app name */,
                         R.string.app_names_concatenation_template_2,

tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java

@@ -18,9 +18,9 @@ package com.android.settings.applications;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -28,7 +28,6 @@ import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.os.UserHandle;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.StorageStatsSource;
 import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
 
@@ -40,8 +39,9 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
 import java.io.IOException;
+import org.robolectric.RobolectricTestRunner;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class FetchPackageStorageAsyncLoaderTest {
 
     private static final String PACKAGE_NAME = "com.test.package";

tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java

@@ -21,9 +21,9 @@ import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -38,14 +38,13 @@ import android.content.pm.UserInfo;
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.shadows.ShadowApplication;
 
 import java.util.ArrayList;
@@ -53,7 +52,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Set;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public final class InstalledAppCounterTest {
 
     private final String APP_1 = "app1";
@@ -232,7 +231,6 @@ public final class InstalledAppCounterTest {
                 .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
     }
 
-
     private class InstalledAppCounterTestable extends InstalledAppCounter {
         private InstalledAppCounterTestable(int installReason) {
             super(mContext, installReason, mPackageManager);

tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java

@@ -20,10 +20,10 @@ import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyObject;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -36,14 +36,13 @@ import android.content.pm.UserInfo;
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.shadows.ShadowApplication;
 
 import java.util.Arrays;
@@ -52,7 +51,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public final class InstalledAppListerTest {
 
     private final String APP_1 = "app1";
@@ -189,7 +188,7 @@ public final class InstalledAppListerTest {
     }
 
     private class InstalledAppListerTestable extends InstalledAppLister {
-        public InstalledAppListerTestable() {
+        private InstalledAppListerTestable() {
             super(mPackageManager, mUserManager);
         }
 

tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java

@@ -18,11 +18,11 @@ package com.android.settings.applications;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.argThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -50,7 +50,6 @@ import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
@@ -62,6 +61,7 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
@@ -69,7 +69,7 @@ import org.robolectric.util.ReflectionHelpers;
 import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class RecentAppsPreferenceControllerTest {
 
     @Mock

tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java

@@ -31,7 +31,6 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.datausage.AppStateDataUsageBridge;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowApplicationsState;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settingslib.applications.ApplicationsState;
@@ -41,12 +40,13 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 import java.util.ArrayList;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowUserManager.class, ShadowApplicationsState.class})
 public class SpecialAppAccessPreferenceControllerTest {
 

tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java

@@ -26,16 +26,16 @@ import android.os.Bundle;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.ApplicationsState;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class UsageAccessDetailsTest {
 
     private FakeFeatureFactory mFeatureFactory;

tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java

@@ -19,7 +19,7 @@ package com.android.settings.applications.appinfo;
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.anyDouble;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -41,7 +41,6 @@ import com.android.internal.os.BatterySipper;
 import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.SettingsActivity;
 import com.android.settings.fuelgauge.BatteryUtils;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -49,13 +48,14 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AppBatteryPreferenceControllerTest {
 
     private static final int TARGET_UID = 111;

tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java

@@ -18,11 +18,11 @@ package com.android.settings.applications.appinfo;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
@@ -49,7 +49,6 @@ import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
@@ -64,9 +63,10 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.stubbing.Answer;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.util.ReflectionHelpers;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AppButtonsPreferenceControllerTest {
 
     private static final String PACKAGE_NAME = "com.android.settings";
@@ -202,7 +202,7 @@ public class AppButtonsPreferenceControllerTest {
     }
 
     @Test
-    public void isAvailable_nonInstantApp() throws Exception {
+    public void isAvailable_nonInstantApp() {
         mController.mAppEntry = mAppEntry;
         ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
                 new InstantAppDataProvider() {
@@ -215,7 +215,7 @@ public class AppButtonsPreferenceControllerTest {
     }
 
     @Test
-    public void isAvailable_instantApp() throws Exception {
+    public void isAvailable_instantApp() {
         mController.mAppEntry = mAppEntry;
         ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
                 new InstantAppDataProvider() {
@@ -371,7 +371,8 @@ public class AppButtonsPreferenceControllerTest {
 
     @Test
     public void onPackageListChanged_available_shouldRefreshUi() {
-        doReturn(mController.AVAILABLE).when(mController).getAvailabilityStatus();
+        doReturn(AppButtonsPreferenceController.AVAILABLE)
+            .when(mController).getAvailabilityStatus();
         doReturn(true).when(mController).refreshUi();
 
         mController.onPackageListChanged();
@@ -381,7 +382,8 @@ public class AppButtonsPreferenceControllerTest {
 
     @Test
     public void onPackageListChanged_notAvailable_shouldNotRefreshUiAndNoCrash() {
-        doReturn(mController.DISABLED_FOR_USER).when(mController).getAvailabilityStatus();
+        doReturn(AppButtonsPreferenceController.DISABLED_FOR_USER)
+            .when(mController).getAvailabilityStatus();
 
         mController.onPackageListChanged();
 

tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java

@@ -36,7 +36,6 @@ import android.os.Bundle;
 
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.datausage.AppDataUsage;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
 import org.junit.Before;
@@ -45,12 +44,13 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 import androidx.loader.app.LoaderManager;
 import androidx.preference.Preference;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AppDataUsagePreferenceControllerTest {
 
     @Mock

tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java

@@ -42,7 +42,6 @@ import androidx.lifecycle.LifecycleOwner;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.widget.LayoutPreference;
@@ -53,9 +52,10 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AppHeaderViewPreferenceControllerTest {
 
     @Mock

tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java

@@ -48,7 +48,6 @@ import android.view.MenuItem;
 
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
@@ -61,6 +60,7 @@ import org.mockito.Answers;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
@@ -68,7 +68,7 @@ import org.robolectric.util.ReflectionHelpers;
 import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public final class AppInfoDashboardFragmentTest {
 
     private static final String PACKAGE_NAME = "test_package_name";
@@ -239,7 +239,8 @@ public final class AppInfoDashboardFragmentTest {
     public void onActivityResult_uninstalledUpdates_shouldInvalidateOptionsMenu() {
         doReturn(true).when(mFragment).refreshUi();
 
-        mFragment.onActivityResult(mFragment.REQUEST_UNINSTALL, 0, mock(Intent.class));
+        mFragment
+            .onActivityResult(AppInfoDashboardFragment.REQUEST_UNINSTALL, 0, mock(Intent.class));
 
         verify(mActivity).invalidateOptionsMenu();
     }

tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java

@@ -36,7 +36,6 @@ import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.notification.AppNotificationSettings;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.ApplicationsState;
 
 import org.junit.Before;
@@ -45,9 +44,10 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AppInfoPreferenceControllerBaseTest {
 
     @Mock

tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java

@@ -40,16 +40,16 @@ import android.os.UserManager;
 import androidx.preference.Preference;
 
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AppInstallerInfoPreferenceControllerTest {
 
     @Mock

tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java

@@ -34,7 +34,6 @@ import com.android.settings.SettingsActivity;
 import com.android.settings.applications.ProcStatsData;
 import com.android.settings.applications.ProcessStatsDetail;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 
 import org.junit.Before;
@@ -43,11 +42,12 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowUserManager.class})
 public class AppMemoryPreferenceControllerTest {
 

tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java

@@ -37,7 +37,6 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.notification.AppNotificationSettings;
 import com.android.settings.notification.NotificationBackend;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.ApplicationsState;
 
 import org.junit.Before;
@@ -45,10 +44,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.util.ReflectionHelpers;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AppNotificationPreferenceControllerTest {
 
     @Mock
@@ -114,7 +114,7 @@ public class AppNotificationPreferenceControllerTest {
 
     @Test
     public void getNotificationSummary_noCrashOnNull() {
-        mController.getNotificationSummary(null, mContext);
+        AppNotificationPreferenceController.getNotificationSummary(null, mContext);
     }
 
     @Test
@@ -122,8 +122,9 @@ public class AppNotificationPreferenceControllerTest {
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         appRow.banned = true;
         appRow.blockedChannelCount = 30;
-        assertThat(mController.getNotificationSummary(appRow, mContext).toString())
-                .isEqualTo("Off");
+        assertThat(
+            AppNotificationPreferenceController.getNotificationSummary(appRow, mContext).toString())
+            .isEqualTo("Off");
     }
 
     @Test
@@ -132,8 +133,9 @@ public class AppNotificationPreferenceControllerTest {
         appRow.banned = false;
         appRow.blockedChannelCount = 30;
         appRow.channelCount = 30;
-        assertThat(mController.getNotificationSummary(appRow, mContext).toString())
-                .isEqualTo("Off");
+        assertThat(
+            AppNotificationPreferenceController.getNotificationSummary(appRow, mContext).toString())
+            .isEqualTo("Off");
     }
 
     @Test
@@ -144,10 +146,13 @@ public class AppNotificationPreferenceControllerTest {
         appRow.channelCount = 60;
         appRow.sentByApp = new NotificationBackend.NotificationsSentState();
         appRow.sentByApp.avgSentWeekly = 4;
-        assertThat(mController.getNotificationSummary(
+        assertThat(AppNotificationPreferenceController.getNotificationSummary(
                 appRow, mContext).toString().contains("30")).isTrue();
-        assertThat(mController.getNotificationSummary(appRow, mContext).toString().contains(
-                NotificationBackend.getSentSummary(mContext, appRow.sentByApp, false))).isTrue();
+        assertThat(
+            AppNotificationPreferenceController.getNotificationSummary(appRow, mContext).toString()
+                .contains(
+                    NotificationBackend.getSentSummary(mContext, appRow.sentByApp, false)))
+            .isTrue();
     }
 
     @Test
@@ -158,7 +163,9 @@ public class AppNotificationPreferenceControllerTest {
         appRow.channelCount = 10;
         appRow.sentByApp = new NotificationBackend.NotificationsSentState();
         appRow.sentByApp.avgSentDaily = 4;
-        assertThat(mController.getNotificationSummary(appRow, mContext).toString()).isEqualTo(
+        assertThat(
+            AppNotificationPreferenceController.getNotificationSummary(appRow, mContext).toString())
+            .isEqualTo(
                 NotificationBackend.getSentSummary(mContext, appRow.sentByApp, false));
     }
 
@@ -170,7 +177,9 @@ public class AppNotificationPreferenceControllerTest {
         appRow.channelCount = 0;
         appRow.sentByApp = new NotificationBackend.NotificationsSentState();
         appRow.sentByApp.avgSentDaily = 7;
-        assertThat(mController.getNotificationSummary(appRow, mContext).toString()).isEqualTo(
+        assertThat(
+            AppNotificationPreferenceController.getNotificationSummary(appRow, mContext).toString())
+            .isEqualTo(
                 NotificationBackend.getSentSummary(mContext, appRow.sentByApp, false));
     }
 }

tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java

@@ -33,7 +33,6 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.applications.AppLaunchSettings;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
@@ -43,10 +42,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.util.ReflectionHelpers;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AppOpenByDefaultPreferenceControllerTest {
 
     @Mock

tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java

@@ -34,7 +34,6 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.ApplicationsState;
 
 import org.junit.Before;
@@ -42,11 +41,12 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AppPermissionPreferenceControllerTest {
 
     @Mock
@@ -77,7 +77,8 @@ public class AppPermissionPreferenceControllerTest {
 
     @Test
     public void getAvailabilityStatus_isAlwaysAvailable() {
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE);
+        assertThat(mController.getAvailabilityStatus())
+            .isEqualTo(AppPermissionPreferenceController.AVAILABLE);
     }
 
     @Test

tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java

@@ -25,19 +25,18 @@ import android.content.pm.ResolveInfo;
 
 import androidx.preference.Preference;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.shadows.ShadowPackageManager;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AppSettingPreferenceControllerTest {
 
     private static final String TEST_PKG_NAME = "test_pkg";

tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java

@@ -33,7 +33,6 @@ import androidx.loader.app.LoaderManager;
 import androidx.preference.Preference;
 
 import com.android.settings.applications.AppStorageSettings;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.StorageStatsSource;
 
@@ -42,9 +41,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AppStoragePreferenceControllerTest {
 
     @Mock

tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java

@@ -25,16 +25,15 @@ import android.content.pm.PackageInfo;
 
 import androidx.preference.Preference;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AppVersionPreferenceControllerTest {
 
     @Mock

tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java

@@ -17,7 +17,7 @@ package com.android.settings.applications.appinfo;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -30,8 +30,6 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
 import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
 
 import org.junit.Before;
@@ -39,12 +37,13 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.androidx.fragment.FragmentController;
 
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class})
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowAlertDialogCompat.class)
 public class ButtonActionDialogFragmentTest {
 
     private static final int FORCE_STOP_ID = ButtonActionDialogFragment.DialogType.FORCE_STOP;

tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java

@@ -32,7 +32,6 @@ import androidx.preference.Preference;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.applications.DefaultAppSettings;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -40,8 +39,9 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class DefaultAppShortcutPreferenceControllerBaseTest {
 
     @Mock
@@ -68,7 +68,8 @@ public class DefaultAppShortcutPreferenceControllerBaseTest {
     public void getAvailabilityStatus_managedProfile_shouldReturnDisabled() {
         when(mUserManager.isManagedProfile()).thenReturn(true);
 
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_FOR_USER);
+        assertThat(mController.getAvailabilityStatus())
+            .isEqualTo(DefaultAppShortcutPreferenceControllerBase.DISABLED_FOR_USER);
     }
 
     @Test
@@ -76,7 +77,8 @@ public class DefaultAppShortcutPreferenceControllerBaseTest {
         mController.capable = true;
         when(mUserManager.isManagedProfile()).thenReturn(false);
 
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE);
+        assertThat(mController.getAvailabilityStatus())
+            .isEqualTo(DefaultAppShortcutPreferenceControllerBase.AVAILABLE);
     }
 
     @Test
@@ -85,7 +87,7 @@ public class DefaultAppShortcutPreferenceControllerBaseTest {
         when(mUserManager.isManagedProfile()).thenReturn(false);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                mController.UNSUPPORTED_ON_DEVICE);
+            DefaultAppShortcutPreferenceControllerBase.UNSUPPORTED_ON_DEVICE);
     }
 
     @Test

tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java

@@ -18,8 +18,8 @@ package com.android.settings.applications.appinfo;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.argThat;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
@@ -28,19 +28,18 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class DefaultBrowserShortcutPreferenceControllerTest {
 
     @Mock

tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java

@@ -29,19 +29,18 @@ import android.content.pm.ResolveInfo;
 import android.provider.Settings;
 import android.telephony.TelephonyManager;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class DefaultEmergencyShortcutPreferenceControllerTest {
 
     @Mock

tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java

@@ -27,19 +27,19 @@ import android.content.Context;
 import android.content.pm.PackageManager;
 
 import com.android.settings.applications.defaultapps.DefaultHomePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class DefaultHomeShortcutPreferenceControllerTest {
 
     @Mock
@@ -89,7 +89,7 @@ public class DefaultHomeShortcutPreferenceControllerTest {
     @Implements(DefaultHomePreferenceController.class)
     public static class ShadowDefaultHomePreferenceController {
         @Implementation
-        public static boolean hasHomePreference(String pkg, Context context) {
+        protected static boolean hasHomePreference(String pkg, Context context) {
             return true;
         }
     }

tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java

@@ -25,19 +25,19 @@ import android.content.Context;
 import android.content.pm.PackageManager;
 
 import com.android.settings.applications.defaultapps.DefaultPhonePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class DefaultPhoneShortcutPreferenceControllerTest {
 
     @Mock
@@ -84,12 +84,12 @@ public class DefaultPhoneShortcutPreferenceControllerTest {
     @Implements(DefaultPhonePreferenceController.class)
     public static class ShadowDefaultPhonePreferenceController {
         @Implementation
-        public static boolean hasPhonePreference(String pkg, Context context) {
+        protected static boolean hasPhonePreference(String pkg, Context context) {
             return true;
         }
 
         @Implementation
-        public static boolean isPhoneDefault(String pkg, Context context) {
+        protected static boolean isPhoneDefault(String pkg, Context context) {
             return true;
         }
     }

tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java

@@ -25,19 +25,19 @@ import android.content.Context;
 import android.content.pm.PackageManager;
 
 import com.android.settings.applications.defaultapps.DefaultSmsPreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class DefaultSmsShortcutPreferenceControllerTest {
 
     @Mock
@@ -84,12 +84,12 @@ public class DefaultSmsShortcutPreferenceControllerTest {
     @Implements(DefaultSmsPreferenceController.class)
     public static class ShadowDefaultSmsPreferenceController {
         @Implementation
-        public static boolean hasSmsPreference(String pkg, Context context) {
+        protected static boolean hasSmsPreference(String pkg, Context context) {
             return true;
         }
 
         @Implementation
-        public static boolean isSmsDefault(String pkg, Context context) {
+        protected static boolean isSmsDefault(String pkg, Context context) {
             return true;
         }
     }

tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java

@@ -33,16 +33,16 @@ import android.os.UserManager;
 import androidx.preference.Preference;
 
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class DrawOverlayDetailPreferenceControllerTest {
 
     @Mock

tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java

@@ -30,7 +30,6 @@ import androidx.fragment.app.FragmentActivity;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowAppInfoBase;
 
 import org.junit.Before;
@@ -41,10 +40,11 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.Spy;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class DrawOverlayDetailsTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)

tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java

@@ -29,16 +29,16 @@ import android.os.UserManager;
 import androidx.preference.Preference;
 
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class ExternalSourceDetailPreferenceControllerTest {
 
     @Mock

tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java

@@ -33,7 +33,6 @@ import android.os.UserManager;
 
 import com.android.settings.applications.AppStateInstallAppsBridge;
 import com.android.settings.applications.AppStateInstallAppsBridge.InstallAppsState;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settingslib.RestrictedPreferenceHelper;
 import com.android.settingslib.RestrictedSwitchPreference;
@@ -43,12 +42,13 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadow.api.Shadow;
 import org.robolectric.util.ReflectionHelpers;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowUserManager.class})
 public class ExternalSourcesDetailsTest {
 

tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java

@@ -17,9 +17,9 @@ package com.android.settings.applications.appinfo;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -34,19 +34,18 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
 import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class})
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowAlertDialogCompat.class)
 public class InstantAppButtonDialogFragmentTest {
 
     private static final String TEST_PACKAGE = "testPackage";

tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java

@@ -49,7 +49,6 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
 import com.android.settingslib.widget.LayoutPreference;
@@ -59,10 +58,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.util.ReflectionHelpers;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class InstantAppButtonsPreferenceControllerTest {
 
     private static final String TEST_INSTALLER_PACKAGE_NAME = "com.installer";
@@ -87,7 +87,7 @@ public class InstantAppButtonsPreferenceControllerTest {
     private InstantAppButtonsPreferenceController mController;
 
     @Before
-    public void setUp() throws PackageManager.NameNotFoundException {
+    public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = spy(RuntimeEnvironment.application);
         when(mContext.getPackageManager()).thenReturn(mPackageManager);

tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java

@@ -32,7 +32,6 @@ import android.util.ArraySet;
 
 import com.android.settings.applications.AppDomainsPreference;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
 
@@ -41,13 +40,14 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.util.ReflectionHelpers;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class InstantAppDomainsPreferenceControllerTest {
 
     @Mock

tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java

@@ -32,18 +32,18 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.shadows.ShadowPackageManager;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class TimeSpentInAppPreferenceControllerTest {
 
     private static final String TEST_KEY = "test_tey";
@@ -92,7 +92,6 @@ public class TimeSpentInAppPreferenceControllerTest {
 
         assertThat(mController.getAvailabilityStatus())
                 .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
-
     }
 
     @Test

tests/robotests/src/com/android/settings/applications/appinfo/WriteSettingsDetailsTest.java

@@ -17,21 +17,21 @@
 package com.android.settings.applications.appinfo;
 
 import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 
 import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class WriteSettingsDetailsTest {
 
     private FakeFeatureFactory mFeatureFactory;