From 3cbff800a3de3302c8bc16dea0e2694aea8c792e Mon Sep 17 00:00:00 2001 From: Xingbin Feng Date: Thu, 7 Jul 2022 08:49:20 +0200 Subject: [PATCH 01/10] Fix incorrect storage calculation when SD card is inserted The displayed internal storage is incorrect when an SD card is inserted into the device. Bug: 209962845 Test: Insert an SD card with some content. The System storage calculation should remain unchanged. Change-Id: I0a338bc306c0ade68747356714cd291e209a5069 --- .../deviceinfo/storage/StorageAsyncLoader.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java b/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java index 611ee24baaa..54935ecf4de 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java +++ b/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java @@ -85,13 +85,15 @@ public class StorageAsyncLoader for (UserInfo info : infos) { final StorageResult result = getAppsAndGamesSize(info.id); - + final Bundle media = new Bundle(); + media.putString(ContentResolver.QUERY_ARG_SQL_SELECTION, MediaColumns.VOLUME_NAME + + "= '" + MediaStore.VOLUME_EXTERNAL_PRIMARY + "'"); result.imagesSize = getFilesSize(info.id, MediaStore.Images.Media.EXTERNAL_CONTENT_URI, - null /* queryArgs */); + media /* queryArgs */); result.videosSize = getFilesSize(info.id, MediaStore.Video.Media.EXTERNAL_CONTENT_URI, - null /* queryArgs */); + media /* queryArgs */); result.audioSize = getFilesSize(info.id, MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, - null /* queryArgs */); + media /* queryArgs */); final Bundle documentsAndOtherQueryArgs = new Bundle(); documentsAndOtherQueryArgs.putString(ContentResolver.QUERY_ARG_SQL_SELECTION, @@ -100,13 +102,14 @@ public class StorageAsyncLoader + " AND " + FileColumns.MEDIA_TYPE + "!=" + FileColumns.MEDIA_TYPE_AUDIO + " AND " + FileColumns.MIME_TYPE + " IS NOT NULL"); result.documentsAndOtherSize = getFilesSize(info.id, - MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL), + MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY), documentsAndOtherQueryArgs); final Bundle trashQueryArgs = new Bundle(); trashQueryArgs.putInt(MediaStore.QUERY_ARG_MATCH_TRASHED, MediaStore.MATCH_ONLY); result.trashSize = getFilesSize(info.id, - MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL), trashQueryArgs); + MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY), + trashQueryArgs); results.put(info.id, result); } From be23c28ff299dc1143f714dc3fa27507d44fbe72 Mon Sep 17 00:00:00 2001 From: Weng Su Date: Fri, 8 Jul 2022 05:37:07 +0800 Subject: [PATCH 02/10] Prevent leaking Wi-Fi dialog on lock screen - The Wi-Fi dialog is designed to be displayed on the system UI - Dismiss Wi-Fi dialog to prevent leaking user data on lock screen Bug: 231583603 Test: manual test make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest Change-Id: Ie67ff1138ffeddd3e358331d8cef61e0629173e2 --- .../settings/wifi/WifiDialogActivity.java | 58 ++++++++++++++++++- .../settings/wifi/WifiDialogActivityTest.java | 36 +++++++++++- 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java index 8a46c9d18c5..e3e77e86000 100644 --- a/src/com/android/settings/wifi/WifiDialogActivity.java +++ b/src/com/android/settings/wifi/WifiDialogActivity.java @@ -19,6 +19,7 @@ package com.android.settings.wifi; import static android.Manifest.permission.ACCESS_FINE_LOCATION; import static android.os.UserManager.DISALLOW_CONFIG_WIFI; +import android.app.KeyguardManager; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; @@ -51,6 +52,7 @@ import com.android.wifitrackerlib.WifiEntry; import com.google.android.setupcompat.util.WizardManagerHelper; import com.google.android.setupdesign.util.ThemeHelper; +import java.lang.ref.WeakReference; import java.time.Clock; import java.time.ZoneOffset; @@ -96,10 +98,12 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog // Interval between initiating NetworkDetailsTracker scans. private static final long SCAN_INTERVAL_MILLIS = 10_000; - private WifiDialog mDialog; + @VisibleForTesting + WifiDialog mDialog; private AccessPoint mAccessPoint; - private WifiDialog2 mDialog2; + @VisibleForTesting + WifiDialog2 mDialog2; // The received intent supports a key of WifiTrackerLib or SettingsLib. private boolean mIsWifiTrackerLib; @@ -108,6 +112,7 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog private NetworkDetailsTracker mNetworkDetailsTracker; private HandlerThread mWorkerThread; private WifiManager mWifiManager; + private LockScreenMonitor mLockScreenMonitor; @Override protected void onCreate(Bundle savedInstanceState) { @@ -184,6 +189,10 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog mDialog.setOnDismissListener(this); } } + + if (mDialog2 != null || mDialog != null) { + mLockScreenMonitor = new LockScreenMonitor(this); + } } @VisibleForTesting @@ -221,6 +230,10 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog } } + if (mLockScreenMonitor != null) { + mLockScreenMonitor.release(); + mLockScreenMonitor = null; + } super.onDestroy(); } @@ -411,4 +424,45 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog } return false; } + + void dismissDialog() { + if (mDialog != null) { + mDialog.dismiss(); + mDialog = null; + } + if (mDialog2 != null) { + mDialog2.dismiss(); + mDialog2 = null; + } + } + + @VisibleForTesting + static final class LockScreenMonitor implements KeyguardManager.KeyguardLockedStateListener { + private final WeakReference mWifiDialogActivity; + private KeyguardManager mKeyguardManager; + + LockScreenMonitor(WifiDialogActivity activity) { + mWifiDialogActivity = new WeakReference<>(activity); + mKeyguardManager = activity.getSystemService(KeyguardManager.class); + mKeyguardManager.addKeyguardLockedStateListener(activity.getMainExecutor(), this); + } + + void release() { + if (mKeyguardManager == null) return; + mKeyguardManager.removeKeyguardLockedStateListener(this); + mKeyguardManager = null; + } + + @Override + public void onKeyguardLockedStateChanged(boolean isKeyguardLocked) { + if (!isKeyguardLocked) return; + WifiDialogActivity activity = mWifiDialogActivity.get(); + if (activity == null) return; + activity.dismissDialog(); + + Log.e(TAG, "Dismiss Wi-Fi dialog to prevent leaking user data on lock screen!"); + EventLog.writeEvent(0x534e4554, "231583603", -1 /* UID */, + "Leak Wi-Fi dialog on lock screen"); + } + } } diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java index 28b7ecbf09b..c9cc02e9afb 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java @@ -33,6 +33,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.app.KeyguardManager; import android.content.Intent; import android.content.pm.PackageManager; import android.net.wifi.WifiConfiguration; @@ -46,7 +47,6 @@ import com.android.wifitrackerlib.WifiEntry; import com.google.android.setupcompat.util.WizardManagerHelper; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -82,6 +82,8 @@ public class WifiDialogActivityTest { Intent mResultData; @Mock WifiConfigController mController; + @Mock + KeyguardManager mKeyguardManager; WifiDialogActivity mActivity; @@ -99,6 +101,7 @@ public class WifiDialogActivityTest { mActivity = spy(Robolectric.setupActivity(WifiDialogActivity.class)); when(mActivity.getSystemService(UserManager.class)).thenReturn(mUserManager); when(mActivity.getSystemService(WifiManager.class)).thenReturn(mWifiManager); + when(mActivity.getSystemService(KeyguardManager.class)).thenReturn(mKeyguardManager); } @Test @@ -294,4 +297,35 @@ public class WifiDialogActivityTest { assertThat(result).isTrue(); } + + @Test + public void dismissDialog_hasDialog_dialogDismiss() { + mActivity.mDialog = mWifiDialog; + mActivity.mDialog2 = mWifiDialog2; + + mActivity.dismissDialog(); + + verify(mWifiDialog).dismiss(); + verify(mWifiDialog2).dismiss(); + } + + @Test + public void onKeyguardLockedStateChanged_keyguardIsNotLocked_doNotDismissDialog() { + WifiDialogActivity.LockScreenMonitor lockScreenMonitor = + new WifiDialogActivity.LockScreenMonitor(mActivity); + + lockScreenMonitor.onKeyguardLockedStateChanged(false /* isKeyguardLocked */); + + verify(mActivity, never()).dismissDialog(); + } + + @Test + public void onKeyguardLockedStateChanged_keyguardIsLocked_dismissDialog() { + WifiDialogActivity.LockScreenMonitor lockScreenMonitor = + new WifiDialogActivity.LockScreenMonitor(mActivity); + + lockScreenMonitor.onKeyguardLockedStateChanged(true /* isKeyguardLocked */); + + verify(mActivity).dismissDialog(); + } } From 61e0bcd19464d3de4c947cdd417d0bf07bb007cb Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Tue, 5 Jul 2022 18:37:05 +0100 Subject: [PATCH 03/10] Use Mockito 4.6.1 API Bug: 236636175 Test: m RunSettingsRoboTests Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b (cherry picked from commit c1c3a84fdcadffc76cf8ed9e665c00d29e91dec8) Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b --- ...ithAdminGrantedPermissionsCounterTest.java | 28 +++++++++---------- ...WithAdminGrantedPermissionsListerTest.java | 26 ++++++++--------- .../applications/InstalledAppListerTest.java | 10 +++---- ...cialAppAccessPreferenceControllerTest.java | 2 +- ...DefaultAssistPreferenceControllerTest.java | 4 +-- .../FingerprintEnrollEnrollingTest.java | 8 +++--- .../FingerprintEnrollFindSensorTest.java | 6 ++-- .../BluetoothDeviceDetailsFragmentTest.java | 2 +- .../DashboardFeatureProviderImplTest.java | 4 +-- .../settings/datausage/AppDataUsageTest.java | 10 +++---- .../datausage/BillingCycleSettingsTest.java | 17 ++++++----- .../datausage/lib/DataUsageLibTest.java | 2 +- ...ZoneDetectionPreferenceControllerTest.java | 4 +-- ...ModuleVersionPreferenceControllerTest.java | 4 +-- ...rmissionsPreferenceControllerTestBase.java | 6 ++-- ...alledPackagesPreferenceControllerTest.java | 4 +-- .../AdvancedPowerUsageDetailTest.java | 9 +++--- ...atteryAppListPreferenceControllerTest.java | 2 +- .../fuelgauge/BatteryBackupHelperTest.java | 10 +++---- .../BatteryChartPreferenceControllerTest.java | 13 +++------ .../fuelgauge/BatteryDiffEntryTest.java | 6 ++-- ...BatteryHeaderPreferenceControllerTest.java | 6 ++-- .../fuelgauge/BatteryOptimizeUtilsTest.java | 10 +++---- .../TetherPreferenceControllerTest.java | 7 ++--- ...utomaticRulesPreferenceControllerTest.java | 17 +++++++++-- ...ConversationsPreferenceControllerTest.java | 4 +-- ...ioritySendersPreferenceControllerTest.java | 4 +-- ...arredContactsPreferenceControllerTest.java | 2 +- ...intJobMessagePreferenceControllerTest.java | 10 +++---- .../PrintJobPreferenceControllerTest.java | 6 ++-- .../actionbar/SearchMenuControllerTest.java | 8 +++--- ...ghlightablePreferenceGroupAdapterTest.java | 8 +++--- .../NetworkRequestDialogFragmentTest.java | 2 +- .../DisclaimerItemListAdapterTest.java | 8 +++--- ...EmergencyCallLimitationDisclaimerTest.java | 4 +-- .../calling/LocationPolicyDisclaimerTest.java | 4 +-- .../WifiCallingDisclaimerFragmentTest.java | 9 +++--- .../WifiCallingSettingsForSubTest.java | 11 ++++---- .../WifiDetailPreferenceController2Test.java | 12 ++++---- 39 files changed, 155 insertions(+), 154 deletions(-) diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java index 4e08f9841df..71c532c7e2f 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.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.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyObject; -import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @@ -39,7 +39,6 @@ import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; -import java.util.Collections; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -49,6 +48,7 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.ShadowApplication; import java.util.Arrays; +import java.util.Collections; @RunWith(RobolectricTestRunner.class) public final class AppWithAdminGrantedPermissionsCounterTest { @@ -129,7 +129,7 @@ public final class AppWithAdminGrantedPermissionsCounterTest { verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID)); verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MANAGED_PROFILE_ID)); - verify(mPackageManager, atLeast(0)).getInstallReason(anyObject(), anyObject()); + verify(mPackageManager, atLeast(0)).getInstallReason(any(), any()); verifyNoMoreInteractions(mPackageManager); } @@ -166,9 +166,9 @@ public final class AppWithAdminGrantedPermissionsCounterTest { } private void configureInstallTimePermissions() throws RemoteException { - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_1_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_1_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_2_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_2_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_3_UID)) .thenReturn(PackageManager.PERMISSION_DENIED); @@ -178,9 +178,9 @@ public final class AppWithAdminGrantedPermissionsCounterTest { .thenReturn(PackageManager.PERMISSION_DENIED); when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_4_UID)) .thenReturn(PackageManager.PERMISSION_GRANTED); - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_5_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_5_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_6_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_6_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); } @@ -189,15 +189,15 @@ public final class AppWithAdminGrantedPermissionsCounterTest { .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED); when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_2)) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED); } diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java index a8186373d38..9a4978b9d6e 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.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.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyObject; -import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @@ -122,19 +122,19 @@ public final class AppWithAdminGrantedPermissionsListerTest { .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED); when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_2)) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); // Grant install-time permissions as appropriate. - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_1_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_1_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_2_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_2_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_3_UID)) .thenReturn(PackageManager.PERMISSION_DENIED); @@ -144,7 +144,7 @@ public final class AppWithAdminGrantedPermissionsListerTest { .thenReturn(PackageManager.PERMISSION_DENIED); when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_4_UID)) .thenReturn(PackageManager.PERMISSION_GRANTED); - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_5_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_5_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); // app3 and app5 were installed by enterprise policy. @@ -168,11 +168,11 @@ public final class AppWithAdminGrantedPermissionsListerTest { buildInfo(APP_6_UID, APP_6, 0 /* flags */, Build.VERSION_CODES.M))); // Grant run-time permissions as appropriate. - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED); // Grant install-time permissions as appropriate. - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_6_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_6_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); // app6 was not installed by enterprise policy. @@ -202,7 +202,7 @@ public final class AppWithAdminGrantedPermissionsListerTest { verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID)); verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MANAGED_PROFILE_ID)); - verify(mPackageManager, atLeast(0)).getInstallReason(anyObject(), anyObject()); + verify(mPackageManager, atLeast(0)).getInstallReason(any(), any()); verifyNoMoreInteractions(mPackageManager); } diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java index e2aed368f80..602d678c9d8 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java @@ -20,11 +20,11 @@ import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; import static com.google.common.truth.Truth.assertThat; -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.any; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.argThat; import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -170,7 +170,7 @@ public final class InstalledAppListerTest { verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID)); verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MANAGED_PROFILE_ID)); verify(mPackageManager, atLeast(0)) - .queryIntentActivitiesAsUser(anyObject(), anyInt(), anyInt()); + .queryIntentActivitiesAsUser(any(), anyInt(), anyInt()); } public static boolean checkAppFound(List mInstalledAppList, String appId, diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java index e0a08364a8c..da5ada783ad 100644 --- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java index 3e46027c362..178a26f8453 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java @@ -24,7 +24,7 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.Manifest; @@ -142,6 +142,6 @@ public class DefaultAssistPreferenceControllerTest { controller.getSettingIntent(null); - verifyZeroInteractions(assistUtils); + verifyNoInteractions(assistUtils); } } diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java index a7b7e85d063..4ea05ee7108 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java @@ -18,9 +18,9 @@ package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import android.content.Intent; @@ -101,4 +101,4 @@ public class FingerprintEnrollEnrollingTest { return callbackCaptor.getValue(); } -} \ No newline at end of file +} diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java index 55f0210dad4..ec17a8602c0 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java @@ -19,9 +19,9 @@ package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import static org.robolectric.RuntimeEnvironment.application; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java index fac8b584f0a..81f485986b9 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java @@ -21,8 +21,8 @@ import static android.bluetooth.BluetoothDevice.BOND_NONE; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java index f2b0acddbed..37b8ab630fb 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java @@ -40,7 +40,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.content.Context; @@ -268,7 +268,7 @@ public class DashboardFeatureProviderImplTest { mImpl.bindPreferenceToTileAndGetObservers(mActivity, mFragment, mForceRoundedIcon, null /* keys */, tile, "123", Preference.DEFAULT_ORDER); - verifyZeroInteractions(tile); + verifyNoInteractions(tile); } @Test diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java index 483d74638a7..47db4f29506 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java @@ -19,14 +19,14 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java index 861b4e395fa..cef5928c717 100644 --- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java @@ -19,16 +19,15 @@ import static android.net.NetworkPolicy.CYCLE_NONE; 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.anyLong; -import static org.mockito.ArgumentMatchers.anyObject; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.nullable; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyLong; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; +import static org.mockito.Mockito.nullable; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -133,9 +132,9 @@ public class BillingCycleSettingsTest { mDataLimit, mDataWarning, mEnableDataLimit, mEnableDataWarning); doReturn("some-string").when(billingCycleSettings).getString(anyInt(), anyInt()); - when(mNetworkPolicyEditor.getPolicyCycleDay(anyObject())).thenReturn(CYCLE_NONE + 1); - when(mNetworkPolicyEditor.getPolicyLimitBytes(anyObject())).thenReturn(2000L); - when(mNetworkPolicyEditor.getPolicyWarningBytes(anyObject())).thenReturn(1000L); + when(mNetworkPolicyEditor.getPolicyCycleDay(any())).thenReturn(CYCLE_NONE + 1); + when(mNetworkPolicyEditor.getPolicyLimitBytes(any())).thenReturn(2000L); + when(mNetworkPolicyEditor.getPolicyWarningBytes(any())).thenReturn(1000L); billingCycleSettings.updatePrefs(); diff --git a/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java b/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java index 70a1a38fa0e..4391425d2ba 100644 --- a/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java +++ b/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java @@ -18,7 +18,7 @@ package com.android.settings.datausage.lib; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java index b9c4edc9af2..9fb364ed62e 100644 --- a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java @@ -24,7 +24,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.app.time.Capabilities; @@ -99,7 +99,7 @@ public class LocationTimeZoneDetectionPreferenceControllerTest { mController.setChecked(true); // Verify the TimeManager was not called. - verifyZeroInteractions(mTimeManager); + verifyNoInteractions(mTimeManager); } @Test diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java index 3f49b15b634..35e044cc2f3 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java @@ -23,8 +23,8 @@ import static com.android.settings.deviceinfo.firmwareversion.MainlineModuleVers import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java index 09d1c84f994..06e41073716 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java @@ -18,10 +18,10 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyObject; -import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -79,7 +79,7 @@ public abstract class AdminGrantedPermissionsPreferenceControllerTestBase { } }).when(mFeatureFactory.applicationFeatureProvider) .calculateNumberOfAppsWithAdminGrantedPermissions(eq(mPermissions), - eq(async), anyObject()); + eq(async), any()); } @Test diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java index f39b4b8821b..c32d2d79256 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.anyObject; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.eq; @@ -74,7 +74,7 @@ public class EnterpriseInstalledPackagesPreferenceControllerTest { return null; } }).when(mFeatureFactory.applicationFeatureProvider) - .calculateNumberOfPolicyInstalledApps(eq(async), anyObject()); + .calculateNumberOfPolicyInstalledApps(eq(async), any()); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index 269c810f852..39f2ce5f314 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java @@ -30,7 +30,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.app.AppOpsManager; @@ -45,7 +45,6 @@ import android.os.BatteryStats; import android.os.Bundle; import android.os.Process; import android.os.UserHandle; -import android.util.Pair; import androidx.fragment.app.FragmentActivity; import androidx.loader.app.LoaderManager; @@ -858,7 +857,7 @@ public class AdvancedPowerUsageDetailTest { mFragment.onRadioButtonClicked(mOptimizePreference); mFragment.onPause(); - verifyZeroInteractions(mMetricsFeatureProvider); + verifyNoInteractions(mMetricsFeatureProvider); } @Test @@ -869,7 +868,7 @@ public class AdvancedPowerUsageDetailTest { mFragment.notifyBackupManager(); - verifyZeroInteractions(mBackupManager); + verifyNoInteractions(mBackupManager); } @Test @@ -892,6 +891,6 @@ public class AdvancedPowerUsageDetailTest { mFragment.onPause(); - verifyZeroInteractions(mBackupManager); + verifyNoInteractions(mBackupManager); } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java index 46773c96622..406fe8ad29a 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java index ca1797ac9e9..256b621e60e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java @@ -33,7 +33,7 @@ import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import android.app.AppOpsManager; import android.app.backup.BackupDataInputStream; @@ -251,7 +251,7 @@ public final class BatteryBackupHelperTest { mBatteryBackupHelper.restoreEntity(mBackupDataInputStream); - verifyZeroInteractions(mBackupDataInputStream); + verifyNoInteractions(mBackupDataInputStream); } @Test @@ -289,13 +289,13 @@ public final class BatteryBackupHelperTest { @Test public void restoreOptimizationMode_nullBytesData_skipRestore() throws Exception { mBatteryBackupHelper.restoreOptimizationMode(new byte[0]); - verifyZeroInteractions(mBatteryOptimizeUtils); + verifyNoInteractions(mBatteryOptimizeUtils); mBatteryBackupHelper.restoreOptimizationMode("invalid data format".getBytes()); - verifyZeroInteractions(mBatteryOptimizeUtils); + verifyNoInteractions(mBatteryOptimizeUtils); mBatteryBackupHelper.restoreOptimizationMode(DELIMITER.getBytes()); - verifyZeroInteractions(mBatteryOptimizeUtils); + verifyNoInteractions(mBatteryOptimizeUtils); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java index 1d74491a0e1..3f54270ce26 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java @@ -18,18 +18,16 @@ package com.android.settings.fuelgauge; 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.anyLong; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyLong; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import android.app.settings.SettingsEnums; -import android.content.Context; import android.content.ContentValues; +import android.content.Context; import android.content.pm.PackageManager; import android.content.res.Configuration; import android.content.res.Resources; @@ -37,13 +35,11 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.LocaleList; import android.text.format.DateUtils; -import android.util.Pair; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; -import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.testutils.FakeFeatureFactory; @@ -58,11 +54,10 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.Locale; -import java.util.List; import java.util.Map; @RunWith(RobolectricTestRunner.class) diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryDiffEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryDiffEntryTest.java index 6ea13901eef..c9201c8d3f9 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryDiffEntryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryDiffEntryTest.java @@ -17,10 +17,10 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Matchers.anyInt; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.spy; import android.content.ContentValues; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java index 6389dc95fe1..78534e138f0 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java @@ -23,7 +23,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.app.Activity; @@ -267,7 +267,7 @@ public class BatteryHeaderPreferenceControllerTest { mController.updateHeaderByBatteryTips(null, mBatteryInfo); - verifyZeroInteractions(mBatteryUsageProgressBarPref); + verifyNoInteractions(mBatteryUsageProgressBarPref); } @Test @@ -277,7 +277,7 @@ public class BatteryHeaderPreferenceControllerTest { mController.updateHeaderByBatteryTips(lowBatteryTip, null); - verifyZeroInteractions(mBatteryUsageProgressBarPref); + verifyNoInteractions(mBatteryUsageProgressBarPref); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java index c154f426b30..db58b630e65 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java @@ -22,11 +22,11 @@ import static com.android.settings.fuelgauge.BatteryOptimizeUtils.MODE_UNRESTRIC import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.app.AppOpsManager; @@ -169,7 +169,7 @@ public class BatteryOptimizeUtilsTest { mBatteryOptimizeUtils.setAppUsageState(MODE_UNRESTRICTED); TimeUnit.SECONDS.sleep(1); - verifyZeroInteractions(mMockBackend); - verifyZeroInteractions(mMockBatteryUtils); + verifyNoInteractions(mMockBackend); + verifyNoInteractions(mMockBatteryUtils); } } diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java index bafc021d9b2..9aa79ff4db6 100644 --- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java @@ -16,16 +16,15 @@ package com.android.settings.network; -import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import android.app.admin.DevicePolicyManager; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothPan; import android.bluetooth.BluetoothProfile; @@ -162,7 +161,7 @@ public class TetherPreferenceControllerTest { mController.onResume(); - verifyZeroInteractions(mPreference); + verifyNoInteractions(mPreference); Settings.Global.putInt(context.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1); diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java index 1660955e323..3791c23193e 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.notification.zen; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; @@ -42,10 +43,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.mockito.internal.util.reflection.FieldSetter; import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; +import java.lang.reflect.Field; import java.util.HashMap; import java.util.Map; @@ -192,16 +193,26 @@ public class ZenModeAutomaticRulesPreferenceControllerTest { rule.setEnabled(false); rMap.put(testId, rule); mockGetAutomaticZenRules(NUM_RULES, rMap); - FieldSetter.setField(mZenRulePreference, ZenRulePreference.class.getDeclaredField("mId"), testId); + setZenRulePreferenceField("mId", testId); mController.updateState(mockPref); verify(mZenRulePreference, times(1)).updatePreference(any()); verify(mockPref, never()).removeAll(); assertEquals(NUM_RULES, mController.mZenRulePreferences.size()); } + private void setZenRulePreferenceField(String name, Object value) { + try { + Field field = ZenRulePreference.class.getDeclaredField("mId"); + field.setAccessible(true); + field.set(mZenRulePreference, value); + } catch (ReflectiveOperationException e) { + fail("Unable to set mZenRulePreference field: " + name); + } + } + private void mockGetAutomaticZenRules(int numRules, Map rules) { Map.Entry[] arr = new Map.Entry[numRules]; rules.entrySet().toArray(arr); when(mBackend.getAutomaticZenRules()).thenReturn(arr); } -} \ No newline at end of file +} diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java index 6bf0538c33b..d5834f932c3 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java @@ -26,7 +26,7 @@ import static com.android.settings.notification.zen.ZenModePriorityConversations import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; @@ -146,4 +146,4 @@ public class ZenModePriorityConversationsPreferenceControllerTest { } return null; } -} \ No newline at end of file +} diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java index 99fa8e6cdd4..c431c5332ab 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java @@ -30,8 +30,8 @@ import static com.android.settings.notification.zen.ZenPrioritySendersHelper.KEY import static com.android.settings.notification.zen.ZenPrioritySendersHelper.KEY_NONE; import static com.android.settings.notification.zen.ZenPrioritySendersHelper.UNKNOWN; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Matchers.any; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java index 2f7dfe7f9b8..01f3dfabcb3 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.notification.zen; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java index 96036d52755..b5d07cc5231 100644 --- a/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java @@ -21,8 +21,8 @@ import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -72,7 +72,7 @@ public class PrintJobMessagePreferenceControllerTest { mPreference = new Preference(mContext); when(mContext.getSystemService(Context.PRINT_SERVICE)).thenReturn(mPrintManager); when(mPrintManager.getGlobalPrintManagerForUser(anyInt())).thenReturn(mPrintManager); - when(mPrintManager.getPrintJob(anyObject())).thenReturn(mPrintJob); + when(mPrintManager.getPrintJob(any())).thenReturn(mPrintJob); when(mPrintJob.getInfo()).thenReturn(mPrintJobInfo); mController = new PrintJobMessagePreferenceController(mContext, PREF_KEY); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); @@ -93,7 +93,7 @@ public class PrintJobMessagePreferenceControllerTest { @Test public void updateUi_visiblePreference() { - when(mPrintJobInfo.getStatus(anyObject())).thenReturn("TestPrint"); + when(mPrintJobInfo.getStatus(any())).thenReturn("TestPrint"); mLifecycle.handleLifecycleEvent(ON_START); assertThat(mPreference.isVisible()).isTrue(); @@ -103,7 +103,7 @@ public class PrintJobMessagePreferenceControllerTest { @Test public void updateUi_invisiblePreference() { - when(mPrintJobInfo.getStatus(anyObject())).thenReturn(null); + when(mPrintJobInfo.getStatus(any())).thenReturn(null); mLifecycle.handleLifecycleEvent(ON_START); assertThat(mPreference.isVisible()).isFalse(); diff --git a/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java index 09c5bf368af..da4d58c757b 100644 --- a/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java @@ -21,8 +21,8 @@ import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -75,7 +75,7 @@ public class PrintJobPreferenceControllerTest { mTestLabel = "PrintTest"; when(mContext.getSystemService(Context.PRINT_SERVICE)).thenReturn(mPrintManager); when(mPrintManager.getGlobalPrintManagerForUser(anyInt())).thenReturn(mPrintManager); - when(mPrintManager.getPrintJob(anyObject())).thenReturn(mPrintJob); + when(mPrintManager.getPrintJob(any())).thenReturn(mPrintJob); when(mPrintJob.getInfo()).thenReturn(mPrintJobInfo); mController = new PrintJobPreferenceController(mContext, PREF_KEY); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java index c646a935192..2a7bd29a964 100644 --- a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java +++ b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java @@ -21,7 +21,7 @@ import static com.android.settings.search.actionbar.SearchMenuController.MENU_SE import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.app.settings.SettingsEnums; @@ -91,7 +91,7 @@ public class SearchMenuControllerTest { SearchMenuController.init(mHost); mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */); - verifyZeroInteractions(mMenu); + verifyNoInteractions(mMenu); } @Test @@ -100,7 +100,7 @@ public class SearchMenuControllerTest { SearchMenuController.init(mHost); mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */); - verifyZeroInteractions(mMenu); + verifyNoInteractions(mMenu); } @Test @@ -112,6 +112,6 @@ public class SearchMenuControllerTest { mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */); - verifyZeroInteractions(mMenu); + verifyNoInteractions(mMenu); } } diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java index 62c7bd8091c..e297b788af9 100644 --- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java +++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java @@ -26,7 +26,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.content.Context; @@ -111,7 +111,7 @@ public class HighlightablePreferenceGroupAdapterTest { ReflectionHelpers.setField(mAdapter, "mHighlightRequested", false); mAdapter.requestHighlight(mRoot, null /* recyclerView */, mock(AppBarLayout.class)); - verifyZeroInteractions(mRoot); + verifyNoInteractions(mRoot); } @Test @@ -125,7 +125,7 @@ public class HighlightablePreferenceGroupAdapterTest { when(mFragment.getArguments()).thenReturn(null); when(mFragment.getPreferenceScreen()).thenReturn(screen); HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(mFragment); - verifyZeroInteractions(screen); + verifyNoInteractions(screen); } @Test @@ -150,7 +150,7 @@ public class HighlightablePreferenceGroupAdapterTest { HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(mFragment); verify(mFragment).getInitialExpandedChildCount(); - verifyZeroInteractions(screen); + verifyNoInteractions(screen); } @Test diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java index e08a14a469d..66d399c8192 100644 --- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java @@ -173,7 +173,7 @@ public class NetworkRequestDialogFragmentTest { } private List createWifiEntryList() { - List wifiEntryList = spy(new ArrayList<>()); + List wifiEntryList = new ArrayList<>(); final WifiEntry wifiEntry1 = mock(WifiEntry.class); when(wifiEntry1.getSsid()).thenReturn("Test AP 1"); diff --git a/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java b/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java index 8478a5471ac..610e520e49b 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java @@ -21,9 +21,9 @@ import static com.android.settings.wifi.calling.DisclaimerItemListAdapter import static com.android.settings.wifi.calling.DisclaimerItemListAdapter .DisclaimerItemViewHolder.ID_DISCLAIMER_ITEM_TITLE; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -75,7 +75,7 @@ public class DisclaimerItemListAdapterTest { mDisclaimerItem = spy(new MockDisclaimerItem(mContext, 0 /* subId */)); mDisclaimerItemList.add(mDisclaimerItem); - when(mLayoutInflater.inflate(anyInt(), anyObject(), anyBoolean())).thenReturn(mView); + when(mLayoutInflater.inflate(anyInt(), any(), anyBoolean())).thenReturn(mView); when(mViewGroup.getContext()).thenReturn(mContext); when(mViewGroup.getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE)).thenReturn( mLayoutInflater); diff --git a/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java b/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java index 985edda69b5..c8e4cce6d0a 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java @@ -18,8 +18,8 @@ package com.android.settings.wifi.calling; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java b/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java index 3fe9678c26e..148095aac02 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java @@ -18,8 +18,8 @@ package com.android.settings.wifi.calling; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java index 207a2318c61..0ece537371f 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java @@ -16,10 +16,9 @@ package com.android.settings.wifi.calling; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -95,7 +94,7 @@ public class WifiCallingDisclaimerFragmentTest { doReturn(mActivity).when(mFragment).getActivity(); - when(mLayoutInflater.inflate(anyInt(), anyObject(), anyBoolean())).thenReturn(mView); + when(mLayoutInflater.inflate(anyInt(), any(), anyBoolean())).thenReturn(mView); when(mView.findViewById(R.id.agree_button)).thenReturn(mAgreeButton); when(mView.findViewById(R.id.disagree_button)).thenReturn(mDisagreeButton); when(mView.findViewById(R.id.disclaimer_item_list)).thenReturn(mRecyclerView); diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java index e2c5ca33b4c..1faa611b970 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java @@ -16,17 +16,17 @@ package com.android.settings.wifi.calling; -import static junit.framework.Assert.assertEquals; - import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT; 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 junit.framework.Assert.assertEquals; + +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -44,7 +44,6 @@ import android.telephony.CarrierConfigManager; import android.telephony.TelephonyManager; import android.telephony.ims.ImsMmTelManager; import android.view.View; -import android.widget.TextView; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java index 08bcd2a2912..b0a50c81fa8 100644 --- a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java +++ b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java @@ -17,15 +17,16 @@ package com.android.settings.wifi.details2; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.nullable; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; +import static org.mockito.Mockito.nullable; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -92,7 +93,6 @@ import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.InOrder; -import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; @@ -1253,7 +1253,7 @@ public class WifiDetailPreferenceController2Test { mMockWifiConfig.creatorUid = doUid; ComponentName doComponent = new ComponentName(doPackage, "some.Class"); try { - when(mMockPackageManager.getPackageUidAsUser(Matchers.anyString(), Matchers.anyInt())) + when(mMockPackageManager.getPackageUidAsUser(anyString(), anyInt())) .thenReturn(doUid); } catch (PackageManager.NameNotFoundException e) { //do nothing From fd63a0aef070825c7f2df2006c6053ee182fd004 Mon Sep 17 00:00:00 2001 From: Grace Cheng Date: Thu, 14 Jul 2022 14:31:48 +0000 Subject: [PATCH 04/10] Add missing description to SUW set pattern lock UI Updates Setup Wizard set pattern lock UI to include a description Fixes: 233666752 Test: Observe description on "Set pattern lock" setup wizard UI Change-Id: I5199eca42ac17886fa200d5abdd41e61f4030950 --- res/layout/choose_lock_pattern_common.xml | 10 ++++++++++ res/values/strings.xml | 2 ++ 2 files changed, 12 insertions(+) diff --git a/res/layout/choose_lock_pattern_common.xml b/res/layout/choose_lock_pattern_common.xml index 2dd8cd576de..761a724f79b 100644 --- a/res/layout/choose_lock_pattern_common.xml +++ b/res/layout/choose_lock_pattern_common.xml @@ -36,6 +36,16 @@ android:paddingLeft="0dp" android:paddingRight="0dp"> + + Set a work PIN Set a pattern + + For added security, set a pattern to unlock the device Set a work pattern From b9503775c008c4475b0a8a6ae497983ce62723ce Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Tue, 5 Jul 2022 18:37:05 +0100 Subject: [PATCH 05/10] Use Mockito 4.6.1 API Bug: 236636175 Test: m RunSettingsRoboTests Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b (cherry picked from commit 61e0bcd19464d3de4c947cdd417d0bf07bb007cb) Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b --- ...ithAdminGrantedPermissionsCounterTest.java | 28 +++++++++---------- ...WithAdminGrantedPermissionsListerTest.java | 26 ++++++++--------- .../applications/InstalledAppListerTest.java | 10 +++---- ...cialAppAccessPreferenceControllerTest.java | 2 +- ...DefaultAssistPreferenceControllerTest.java | 4 +-- .../FingerprintEnrollEnrollingTest.java | 6 ++-- .../FingerprintEnrollFindSensorTest.java | 6 ++-- .../BluetoothDeviceDetailsFragmentTest.java | 2 +- .../DashboardFeatureProviderImplTest.java | 4 +-- .../settings/datausage/AppDataUsageTest.java | 10 +++---- .../datausage/BillingCycleSettingsTest.java | 17 ++++++----- .../datausage/lib/DataUsageLibTest.java | 2 +- ...ZoneDetectionPreferenceControllerTest.java | 4 +-- ...ModuleVersionPreferenceControllerTest.java | 4 +-- ...rmissionsPreferenceControllerTestBase.java | 6 ++-- ...alledPackagesPreferenceControllerTest.java | 4 +-- .../AdvancedPowerUsageDetailTest.java | 9 +++--- ...atteryAppListPreferenceControllerTest.java | 2 +- .../fuelgauge/BatteryBackupHelperTest.java | 10 +++---- .../BatteryChartPreferenceControllerTest.java | 13 +++------ .../fuelgauge/BatteryDiffEntryTest.java | 6 ++-- ...BatteryHeaderPreferenceControllerTest.java | 6 ++-- .../fuelgauge/BatteryOptimizeUtilsTest.java | 10 +++---- .../TetherPreferenceControllerTest.java | 6 ++-- ...utomaticRulesPreferenceControllerTest.java | 17 +++++++++-- ...ConversationsPreferenceControllerTest.java | 4 +-- ...ioritySendersPreferenceControllerTest.java | 2 +- ...arredContactsPreferenceControllerTest.java | 2 +- ...intJobMessagePreferenceControllerTest.java | 10 +++---- .../PrintJobPreferenceControllerTest.java | 6 ++-- .../actionbar/SearchMenuControllerTest.java | 8 +++--- ...ghlightablePreferenceGroupAdapterTest.java | 8 +++--- .../NetworkRequestDialogFragmentTest.java | 2 +- .../DisclaimerItemListAdapterTest.java | 8 +++--- ...EmergencyCallLimitationDisclaimerTest.java | 4 +-- .../calling/LocationPolicyDisclaimerTest.java | 4 +-- .../WifiCallingDisclaimerFragmentTest.java | 9 +++--- .../WifiCallingSettingsForSubTest.java | 11 ++++---- .../WifiDetailPreferenceController2Test.java | 12 ++++---- 39 files changed, 153 insertions(+), 151 deletions(-) diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java index 4e08f9841df..71c532c7e2f 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.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.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyObject; -import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @@ -39,7 +39,6 @@ import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; -import java.util.Collections; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -49,6 +48,7 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.ShadowApplication; import java.util.Arrays; +import java.util.Collections; @RunWith(RobolectricTestRunner.class) public final class AppWithAdminGrantedPermissionsCounterTest { @@ -129,7 +129,7 @@ public final class AppWithAdminGrantedPermissionsCounterTest { verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID)); verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MANAGED_PROFILE_ID)); - verify(mPackageManager, atLeast(0)).getInstallReason(anyObject(), anyObject()); + verify(mPackageManager, atLeast(0)).getInstallReason(any(), any()); verifyNoMoreInteractions(mPackageManager); } @@ -166,9 +166,9 @@ public final class AppWithAdminGrantedPermissionsCounterTest { } private void configureInstallTimePermissions() throws RemoteException { - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_1_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_1_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_2_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_2_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_3_UID)) .thenReturn(PackageManager.PERMISSION_DENIED); @@ -178,9 +178,9 @@ public final class AppWithAdminGrantedPermissionsCounterTest { .thenReturn(PackageManager.PERMISSION_DENIED); when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_4_UID)) .thenReturn(PackageManager.PERMISSION_GRANTED); - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_5_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_5_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_6_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_6_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); } @@ -189,15 +189,15 @@ public final class AppWithAdminGrantedPermissionsCounterTest { .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED); when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_2)) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED); } diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java index a8186373d38..9a4978b9d6e 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.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.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyObject; -import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @@ -122,19 +122,19 @@ public final class AppWithAdminGrantedPermissionsListerTest { .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED); when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_2)) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); // Grant install-time permissions as appropriate. - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_1_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_1_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_2_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_2_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_3_UID)) .thenReturn(PackageManager.PERMISSION_DENIED); @@ -144,7 +144,7 @@ public final class AppWithAdminGrantedPermissionsListerTest { .thenReturn(PackageManager.PERMISSION_DENIED); when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_4_UID)) .thenReturn(PackageManager.PERMISSION_GRANTED); - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_5_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_5_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); // app3 and app5 were installed by enterprise policy. @@ -168,11 +168,11 @@ public final class AppWithAdminGrantedPermissionsListerTest { buildInfo(APP_6_UID, APP_6, 0 /* flags */, Build.VERSION_CODES.M))); // Grant run-time permissions as appropriate. - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED); // Grant install-time permissions as appropriate. - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_6_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_6_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); // app6 was not installed by enterprise policy. @@ -202,7 +202,7 @@ public final class AppWithAdminGrantedPermissionsListerTest { verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID)); verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MANAGED_PROFILE_ID)); - verify(mPackageManager, atLeast(0)).getInstallReason(anyObject(), anyObject()); + verify(mPackageManager, atLeast(0)).getInstallReason(any(), any()); verifyNoMoreInteractions(mPackageManager); } diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java index e2aed368f80..602d678c9d8 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java @@ -20,11 +20,11 @@ import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; import static com.google.common.truth.Truth.assertThat; -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.any; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.argThat; import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -170,7 +170,7 @@ public final class InstalledAppListerTest { verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID)); verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MANAGED_PROFILE_ID)); verify(mPackageManager, atLeast(0)) - .queryIntentActivitiesAsUser(anyObject(), anyInt(), anyInt()); + .queryIntentActivitiesAsUser(any(), anyInt(), anyInt()); } public static boolean checkAppFound(List mInstalledAppList, String appId, diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java index e0a08364a8c..da5ada783ad 100644 --- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java index 3e46027c362..178a26f8453 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java @@ -24,7 +24,7 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.Manifest; @@ -142,6 +142,6 @@ public class DefaultAssistPreferenceControllerTest { controller.getSettingIntent(null); - verifyZeroInteractions(assistUtils); + verifyNoInteractions(assistUtils); } } diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java index 9b39a034f0b..4ea05ee7108 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java @@ -18,9 +18,9 @@ package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java index 55f0210dad4..ec17a8602c0 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java @@ -19,9 +19,9 @@ package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import static org.robolectric.RuntimeEnvironment.application; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java index fac8b584f0a..81f485986b9 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java @@ -21,8 +21,8 @@ import static android.bluetooth.BluetoothDevice.BOND_NONE; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java index e7c99c873b1..9b5f9fb6738 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java @@ -40,7 +40,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.content.Context; @@ -268,7 +268,7 @@ public class DashboardFeatureProviderImplTest { mImpl.bindPreferenceToTileAndGetObservers(mActivity, mFragment, mForceRoundedIcon, null /* keys */, tile, "123", Preference.DEFAULT_ORDER); - verifyZeroInteractions(tile); + verifyNoInteractions(tile); } @Test diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java index 09c57340d60..020bac6f2a2 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java @@ -19,14 +19,14 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java index 861b4e395fa..cef5928c717 100644 --- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java @@ -19,16 +19,15 @@ import static android.net.NetworkPolicy.CYCLE_NONE; 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.anyLong; -import static org.mockito.ArgumentMatchers.anyObject; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.nullable; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyLong; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; +import static org.mockito.Mockito.nullable; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -133,9 +132,9 @@ public class BillingCycleSettingsTest { mDataLimit, mDataWarning, mEnableDataLimit, mEnableDataWarning); doReturn("some-string").when(billingCycleSettings).getString(anyInt(), anyInt()); - when(mNetworkPolicyEditor.getPolicyCycleDay(anyObject())).thenReturn(CYCLE_NONE + 1); - when(mNetworkPolicyEditor.getPolicyLimitBytes(anyObject())).thenReturn(2000L); - when(mNetworkPolicyEditor.getPolicyWarningBytes(anyObject())).thenReturn(1000L); + when(mNetworkPolicyEditor.getPolicyCycleDay(any())).thenReturn(CYCLE_NONE + 1); + when(mNetworkPolicyEditor.getPolicyLimitBytes(any())).thenReturn(2000L); + when(mNetworkPolicyEditor.getPolicyWarningBytes(any())).thenReturn(1000L); billingCycleSettings.updatePrefs(); diff --git a/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java b/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java index 70a1a38fa0e..4391425d2ba 100644 --- a/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java +++ b/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java @@ -18,7 +18,7 @@ package com.android.settings.datausage.lib; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java index b9c4edc9af2..9fb364ed62e 100644 --- a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java @@ -24,7 +24,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.app.time.Capabilities; @@ -99,7 +99,7 @@ public class LocationTimeZoneDetectionPreferenceControllerTest { mController.setChecked(true); // Verify the TimeManager was not called. - verifyZeroInteractions(mTimeManager); + verifyNoInteractions(mTimeManager); } @Test diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java index 3f49b15b634..35e044cc2f3 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java @@ -23,8 +23,8 @@ import static com.android.settings.deviceinfo.firmwareversion.MainlineModuleVers import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java index 6c136f1c045..e0dcab2db91 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java @@ -18,9 +18,9 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyObject; -import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.when; import android.content.Context; @@ -74,7 +74,7 @@ public abstract class AdminGrantedPermissionsPreferenceControllerTestBase { } }).when(mFeatureFactory.applicationFeatureProvider) .calculateNumberOfAppsWithAdminGrantedPermissions(eq(mPermissions), - eq(async), anyObject()); + eq(async), any()); } @Test diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java index 232d3e792c7..c337cfdefb0 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.anyObject; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.when; @@ -69,7 +69,7 @@ public class EnterpriseInstalledPackagesPreferenceControllerTest { return null; } }).when(mFeatureFactory.applicationFeatureProvider) - .calculateNumberOfPolicyInstalledApps(eq(async), anyObject()); + .calculateNumberOfPolicyInstalledApps(eq(async), any()); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index 0a48cd1b12f..c73ac1c6f8f 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java @@ -30,7 +30,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.app.AppOpsManager; @@ -44,7 +44,6 @@ import android.graphics.drawable.Drawable; import android.os.BatteryStats; import android.os.Bundle; import android.os.UserHandle; -import android.util.Pair; import androidx.fragment.app.FragmentActivity; import androidx.loader.app.LoaderManager; @@ -823,7 +822,7 @@ public class AdvancedPowerUsageDetailTest { mFragment.onRadioButtonClicked(mOptimizePreference); mFragment.onPause(); - verifyZeroInteractions(mMetricsFeatureProvider); + verifyNoInteractions(mMetricsFeatureProvider); } @Test @@ -834,7 +833,7 @@ public class AdvancedPowerUsageDetailTest { mFragment.notifyBackupManager(); - verifyZeroInteractions(mBackupManager); + verifyNoInteractions(mBackupManager); } @Test @@ -857,6 +856,6 @@ public class AdvancedPowerUsageDetailTest { mFragment.onPause(); - verifyZeroInteractions(mBackupManager); + verifyNoInteractions(mBackupManager); } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java index 5e69b8fb05b..b4c532eb3e9 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java index 0f178e02ffe..161121a6c2d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java @@ -33,7 +33,7 @@ import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import android.app.AppOpsManager; import android.app.backup.BackupDataInputStream; @@ -251,7 +251,7 @@ public final class BatteryBackupHelperTest { mBatteryBackupHelper.restoreEntity(mBackupDataInputStream); - verifyZeroInteractions(mBackupDataInputStream); + verifyNoInteractions(mBackupDataInputStream); } @Test @@ -289,13 +289,13 @@ public final class BatteryBackupHelperTest { @Test public void restoreOptimizationMode_nullBytesData_skipRestore() throws Exception { mBatteryBackupHelper.restoreOptimizationMode(new byte[0]); - verifyZeroInteractions(mBatteryOptimizeUtils); + verifyNoInteractions(mBatteryOptimizeUtils); mBatteryBackupHelper.restoreOptimizationMode("invalid data format".getBytes()); - verifyZeroInteractions(mBatteryOptimizeUtils); + verifyNoInteractions(mBatteryOptimizeUtils); mBatteryBackupHelper.restoreOptimizationMode(DELIMITER.getBytes()); - verifyZeroInteractions(mBatteryOptimizeUtils); + verifyNoInteractions(mBatteryOptimizeUtils); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java index 1d74491a0e1..3f54270ce26 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java @@ -18,18 +18,16 @@ package com.android.settings.fuelgauge; 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.anyLong; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyLong; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import android.app.settings.SettingsEnums; -import android.content.Context; import android.content.ContentValues; +import android.content.Context; import android.content.pm.PackageManager; import android.content.res.Configuration; import android.content.res.Resources; @@ -37,13 +35,11 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.LocaleList; import android.text.format.DateUtils; -import android.util.Pair; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; -import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.testutils.FakeFeatureFactory; @@ -58,11 +54,10 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.Locale; -import java.util.List; import java.util.Map; @RunWith(RobolectricTestRunner.class) diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryDiffEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryDiffEntryTest.java index b1d8f0d5a6d..8ffa820ec2b 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryDiffEntryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryDiffEntryTest.java @@ -17,10 +17,10 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Matchers.anyInt; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.spy; import android.content.ContentValues; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java index 6389dc95fe1..78534e138f0 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java @@ -23,7 +23,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.app.Activity; @@ -267,7 +267,7 @@ public class BatteryHeaderPreferenceControllerTest { mController.updateHeaderByBatteryTips(null, mBatteryInfo); - verifyZeroInteractions(mBatteryUsageProgressBarPref); + verifyNoInteractions(mBatteryUsageProgressBarPref); } @Test @@ -277,7 +277,7 @@ public class BatteryHeaderPreferenceControllerTest { mController.updateHeaderByBatteryTips(lowBatteryTip, null); - verifyZeroInteractions(mBatteryUsageProgressBarPref); + verifyNoInteractions(mBatteryUsageProgressBarPref); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java index c154f426b30..db58b630e65 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java @@ -22,11 +22,11 @@ import static com.android.settings.fuelgauge.BatteryOptimizeUtils.MODE_UNRESTRIC import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.app.AppOpsManager; @@ -169,7 +169,7 @@ public class BatteryOptimizeUtilsTest { mBatteryOptimizeUtils.setAppUsageState(MODE_UNRESTRICTED); TimeUnit.SECONDS.sleep(1); - verifyZeroInteractions(mMockBackend); - verifyZeroInteractions(mMockBatteryUtils); + verifyNoInteractions(mMockBackend); + verifyNoInteractions(mMockBatteryUtils); } } diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java index b80bc11169b..5d8e70e7e6f 100644 --- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java @@ -16,12 +16,12 @@ package com.android.settings.network; -import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.bluetooth.BluetoothAdapter; @@ -158,7 +158,7 @@ public class TetherPreferenceControllerTest { mController.onResume(); - verifyZeroInteractions(mPreference); + verifyNoInteractions(mPreference); Settings.Global.putInt(context.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1); diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java index b2a54ca4455..881ee26df93 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.notification.zen; +import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; @@ -43,11 +44,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.mockito.internal.util.reflection.FieldSetter; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import java.lang.reflect.Field; import java.util.HashMap; import java.util.Map; @@ -145,15 +146,25 @@ public class ZenModeAutomaticRulesPreferenceControllerTest { rule.setEnabled(false); rMap.put(testId, rule); mockGetAutomaticZenRules(NUM_RULES, rMap); - FieldSetter.setField(mZenRulePreference, ZenRulePreference.class.getDeclaredField("mId"), testId); + setZenRulePreferenceField("mId", testId); mController.updateState(mockPref); verify(mZenRulePreference, times(1)).updatePreference(any()); verify(mController, never()).reloadAllRules(any()); } + private void setZenRulePreferenceField(String name, Object value) { + try { + Field field = ZenRulePreference.class.getDeclaredField("mId"); + field.setAccessible(true); + field.set(mZenRulePreference, value); + } catch (ReflectiveOperationException e) { + fail("Unable to set mZenRulePreference field: " + name); + } + } + private void mockGetAutomaticZenRules(int numRules, Map rules) { Map.Entry[] arr = new Map.Entry[numRules]; rules.entrySet().toArray(arr); when(mBackend.getAutomaticZenRules()).thenReturn(arr); } -} \ No newline at end of file +} diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java index a8a8a7a3ed3..6f6fb038b56 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java @@ -26,7 +26,7 @@ import static com.android.settings.notification.zen.ZenModePriorityConversations import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; @@ -146,4 +146,4 @@ public class ZenModePriorityConversationsPreferenceControllerTest { } return null; } -} \ No newline at end of file +} diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java index 7dde1cd042e..c1c912e6aae 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java @@ -28,7 +28,7 @@ import static com.android.settings.notification.zen.ZenModePrioritySendersPrefer import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java index 2f7dfe7f9b8..01f3dfabcb3 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.notification.zen; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java index 96036d52755..b5d07cc5231 100644 --- a/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java @@ -21,8 +21,8 @@ import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -72,7 +72,7 @@ public class PrintJobMessagePreferenceControllerTest { mPreference = new Preference(mContext); when(mContext.getSystemService(Context.PRINT_SERVICE)).thenReturn(mPrintManager); when(mPrintManager.getGlobalPrintManagerForUser(anyInt())).thenReturn(mPrintManager); - when(mPrintManager.getPrintJob(anyObject())).thenReturn(mPrintJob); + when(mPrintManager.getPrintJob(any())).thenReturn(mPrintJob); when(mPrintJob.getInfo()).thenReturn(mPrintJobInfo); mController = new PrintJobMessagePreferenceController(mContext, PREF_KEY); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); @@ -93,7 +93,7 @@ public class PrintJobMessagePreferenceControllerTest { @Test public void updateUi_visiblePreference() { - when(mPrintJobInfo.getStatus(anyObject())).thenReturn("TestPrint"); + when(mPrintJobInfo.getStatus(any())).thenReturn("TestPrint"); mLifecycle.handleLifecycleEvent(ON_START); assertThat(mPreference.isVisible()).isTrue(); @@ -103,7 +103,7 @@ public class PrintJobMessagePreferenceControllerTest { @Test public void updateUi_invisiblePreference() { - when(mPrintJobInfo.getStatus(anyObject())).thenReturn(null); + when(mPrintJobInfo.getStatus(any())).thenReturn(null); mLifecycle.handleLifecycleEvent(ON_START); assertThat(mPreference.isVisible()).isFalse(); diff --git a/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java index 09c5bf368af..da4d58c757b 100644 --- a/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java @@ -21,8 +21,8 @@ import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -75,7 +75,7 @@ public class PrintJobPreferenceControllerTest { mTestLabel = "PrintTest"; when(mContext.getSystemService(Context.PRINT_SERVICE)).thenReturn(mPrintManager); when(mPrintManager.getGlobalPrintManagerForUser(anyInt())).thenReturn(mPrintManager); - when(mPrintManager.getPrintJob(anyObject())).thenReturn(mPrintJob); + when(mPrintManager.getPrintJob(any())).thenReturn(mPrintJob); when(mPrintJob.getInfo()).thenReturn(mPrintJobInfo); mController = new PrintJobPreferenceController(mContext, PREF_KEY); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java index c646a935192..2a7bd29a964 100644 --- a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java +++ b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java @@ -21,7 +21,7 @@ import static com.android.settings.search.actionbar.SearchMenuController.MENU_SE import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.app.settings.SettingsEnums; @@ -91,7 +91,7 @@ public class SearchMenuControllerTest { SearchMenuController.init(mHost); mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */); - verifyZeroInteractions(mMenu); + verifyNoInteractions(mMenu); } @Test @@ -100,7 +100,7 @@ public class SearchMenuControllerTest { SearchMenuController.init(mHost); mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */); - verifyZeroInteractions(mMenu); + verifyNoInteractions(mMenu); } @Test @@ -112,6 +112,6 @@ public class SearchMenuControllerTest { mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */); - verifyZeroInteractions(mMenu); + verifyNoInteractions(mMenu); } } diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java index 62c7bd8091c..e297b788af9 100644 --- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java +++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java @@ -26,7 +26,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.content.Context; @@ -111,7 +111,7 @@ public class HighlightablePreferenceGroupAdapterTest { ReflectionHelpers.setField(mAdapter, "mHighlightRequested", false); mAdapter.requestHighlight(mRoot, null /* recyclerView */, mock(AppBarLayout.class)); - verifyZeroInteractions(mRoot); + verifyNoInteractions(mRoot); } @Test @@ -125,7 +125,7 @@ public class HighlightablePreferenceGroupAdapterTest { when(mFragment.getArguments()).thenReturn(null); when(mFragment.getPreferenceScreen()).thenReturn(screen); HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(mFragment); - verifyZeroInteractions(screen); + verifyNoInteractions(screen); } @Test @@ -150,7 +150,7 @@ public class HighlightablePreferenceGroupAdapterTest { HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(mFragment); verify(mFragment).getInitialExpandedChildCount(); - verifyZeroInteractions(screen); + verifyNoInteractions(screen); } @Test diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java index 2e9f0190845..bb9bae4c659 100644 --- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java @@ -163,7 +163,7 @@ public class NetworkRequestDialogFragmentTest { } private List createWifiEntryList() { - List wifiEntryList = spy(new ArrayList<>()); + List wifiEntryList = new ArrayList<>(); final WifiEntry wifiEntry1 = mock(WifiEntry.class); when(wifiEntry1.getSsid()).thenReturn("Test AP 1"); diff --git a/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java b/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java index 8478a5471ac..610e520e49b 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java @@ -21,9 +21,9 @@ import static com.android.settings.wifi.calling.DisclaimerItemListAdapter import static com.android.settings.wifi.calling.DisclaimerItemListAdapter .DisclaimerItemViewHolder.ID_DISCLAIMER_ITEM_TITLE; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -75,7 +75,7 @@ public class DisclaimerItemListAdapterTest { mDisclaimerItem = spy(new MockDisclaimerItem(mContext, 0 /* subId */)); mDisclaimerItemList.add(mDisclaimerItem); - when(mLayoutInflater.inflate(anyInt(), anyObject(), anyBoolean())).thenReturn(mView); + when(mLayoutInflater.inflate(anyInt(), any(), anyBoolean())).thenReturn(mView); when(mViewGroup.getContext()).thenReturn(mContext); when(mViewGroup.getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE)).thenReturn( mLayoutInflater); diff --git a/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java b/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java index 985edda69b5..c8e4cce6d0a 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java @@ -18,8 +18,8 @@ package com.android.settings.wifi.calling; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java b/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java index 3fe9678c26e..148095aac02 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java @@ -18,8 +18,8 @@ package com.android.settings.wifi.calling; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java index 207a2318c61..0ece537371f 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java @@ -16,10 +16,9 @@ package com.android.settings.wifi.calling; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -95,7 +94,7 @@ public class WifiCallingDisclaimerFragmentTest { doReturn(mActivity).when(mFragment).getActivity(); - when(mLayoutInflater.inflate(anyInt(), anyObject(), anyBoolean())).thenReturn(mView); + when(mLayoutInflater.inflate(anyInt(), any(), anyBoolean())).thenReturn(mView); when(mView.findViewById(R.id.agree_button)).thenReturn(mAgreeButton); when(mView.findViewById(R.id.disagree_button)).thenReturn(mDisagreeButton); when(mView.findViewById(R.id.disclaimer_item_list)).thenReturn(mRecyclerView); diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java index 74bdddabbe5..2232f3e7778 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java @@ -16,17 +16,17 @@ package com.android.settings.wifi.calling; -import static junit.framework.Assert.assertEquals; - import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT; 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 junit.framework.Assert.assertEquals; + +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -44,7 +44,6 @@ import android.telephony.CarrierConfigManager; import android.telephony.TelephonyManager; import android.telephony.ims.ImsMmTelManager; import android.view.View; -import android.widget.TextView; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java index 6a098bc9ead..1faee8f444e 100644 --- a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java +++ b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java @@ -17,15 +17,16 @@ package com.android.settings.wifi.details2; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.nullable; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; +import static org.mockito.Mockito.nullable; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -94,7 +95,6 @@ import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.InOrder; -import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; @@ -1261,7 +1261,7 @@ public class WifiDetailPreferenceController2Test { mMockWifiConfig.creatorUid = doUid; ComponentName doComponent = new ComponentName(doPackage, "some.Class"); try { - when(mMockPackageManager.getPackageUidAsUser(Matchers.anyString(), Matchers.anyInt())) + when(mMockPackageManager.getPackageUidAsUser(anyString(), anyInt())) .thenReturn(doUid); } catch (PackageManager.NameNotFoundException e) { //do nothing From 21744cf2d1f2bc8c0e22c44900e616b7fd6a579e Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Mon, 18 Jul 2022 13:13:34 -0400 Subject: [PATCH 06/10] Update strings Test: view notification settings on device Fixes: 231232522 Change-Id: I04e236df65c89737a99e37ab818ec330629a942f --- res/values/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index fde4f262b59..63d3c5998bc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -9473,12 +9473,12 @@ - ~%d notification per day - ~%,d notifications per day + About %d notification per day + About %,d notifications per day - ~%d notification per week - ~%,d notifications per week + About %d notification per week + About %,d notifications per week Never From e2b0873f9c9da7016a5a6e0957a04d0c4ea8510a Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Tue, 5 Jul 2022 18:37:05 +0100 Subject: [PATCH 07/10] Use Mockito 4.6.1 API Bug: 236636175 Test: m RunSettingsRoboTests Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b (cherry picked from commit c1c3a84fdcadffc76cf8ed9e665c00d29e91dec8) Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b (cherry picked from commit 61e0bcd19464d3de4c947cdd417d0bf07bb007cb) Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b --- ...ithAdminGrantedPermissionsCounterTest.java | 28 +++++++++---------- ...WithAdminGrantedPermissionsListerTest.java | 26 ++++++++--------- .../applications/InstalledAppListerTest.java | 10 +++---- ...cialAppAccessPreferenceControllerTest.java | 2 +- ...DefaultAssistPreferenceControllerTest.java | 4 +-- .../FingerprintEnrollEnrollingTest.java | 8 +++--- .../FingerprintEnrollFindSensorTest.java | 6 ++-- .../BluetoothDeviceDetailsFragmentTest.java | 2 +- .../DashboardFeatureProviderImplTest.java | 4 +-- .../settings/datausage/AppDataUsageTest.java | 10 +++---- .../datausage/BillingCycleSettingsTest.java | 17 ++++++----- .../datausage/lib/DataUsageLibTest.java | 2 +- ...ZoneDetectionPreferenceControllerTest.java | 4 +-- ...ModuleVersionPreferenceControllerTest.java | 4 +-- ...rmissionsPreferenceControllerTestBase.java | 6 ++-- ...alledPackagesPreferenceControllerTest.java | 4 +-- .../AdvancedPowerUsageDetailTest.java | 9 +++--- ...atteryAppListPreferenceControllerTest.java | 2 +- .../fuelgauge/BatteryBackupHelperTest.java | 10 +++---- .../BatteryChartPreferenceControllerTest.java | 13 +++------ .../fuelgauge/BatteryDiffEntryTest.java | 6 ++-- ...BatteryHeaderPreferenceControllerTest.java | 6 ++-- .../fuelgauge/BatteryOptimizeUtilsTest.java | 10 +++---- .../TetherPreferenceControllerTest.java | 7 ++--- ...utomaticRulesPreferenceControllerTest.java | 17 +++++++++-- ...ConversationsPreferenceControllerTest.java | 4 +-- ...ioritySendersPreferenceControllerTest.java | 4 +-- ...arredContactsPreferenceControllerTest.java | 2 +- ...intJobMessagePreferenceControllerTest.java | 10 +++---- .../PrintJobPreferenceControllerTest.java | 6 ++-- .../actionbar/SearchMenuControllerTest.java | 8 +++--- ...ghlightablePreferenceGroupAdapterTest.java | 8 +++--- .../NetworkRequestDialogFragmentTest.java | 2 +- .../DisclaimerItemListAdapterTest.java | 8 +++--- ...EmergencyCallLimitationDisclaimerTest.java | 4 +-- .../calling/LocationPolicyDisclaimerTest.java | 4 +-- .../WifiCallingDisclaimerFragmentTest.java | 9 +++--- .../WifiCallingSettingsForSubTest.java | 11 ++++---- .../WifiDetailPreferenceController2Test.java | 12 ++++---- 39 files changed, 155 insertions(+), 154 deletions(-) diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java index 4e08f9841df..71c532c7e2f 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.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.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyObject; -import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @@ -39,7 +39,6 @@ import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; -import java.util.Collections; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -49,6 +48,7 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.ShadowApplication; import java.util.Arrays; +import java.util.Collections; @RunWith(RobolectricTestRunner.class) public final class AppWithAdminGrantedPermissionsCounterTest { @@ -129,7 +129,7 @@ public final class AppWithAdminGrantedPermissionsCounterTest { verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID)); verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MANAGED_PROFILE_ID)); - verify(mPackageManager, atLeast(0)).getInstallReason(anyObject(), anyObject()); + verify(mPackageManager, atLeast(0)).getInstallReason(any(), any()); verifyNoMoreInteractions(mPackageManager); } @@ -166,9 +166,9 @@ public final class AppWithAdminGrantedPermissionsCounterTest { } private void configureInstallTimePermissions() throws RemoteException { - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_1_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_1_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_2_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_2_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_3_UID)) .thenReturn(PackageManager.PERMISSION_DENIED); @@ -178,9 +178,9 @@ public final class AppWithAdminGrantedPermissionsCounterTest { .thenReturn(PackageManager.PERMISSION_DENIED); when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_4_UID)) .thenReturn(PackageManager.PERMISSION_GRANTED); - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_5_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_5_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_6_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_6_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); } @@ -189,15 +189,15 @@ public final class AppWithAdminGrantedPermissionsCounterTest { .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED); when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_2)) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED); } diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java index a8186373d38..9a4978b9d6e 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.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.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyObject; -import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @@ -122,19 +122,19 @@ public final class AppWithAdminGrantedPermissionsListerTest { .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED); when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_2)) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED); // Grant install-time permissions as appropriate. - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_1_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_1_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_2_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_2_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_3_UID)) .thenReturn(PackageManager.PERMISSION_DENIED); @@ -144,7 +144,7 @@ public final class AppWithAdminGrantedPermissionsListerTest { .thenReturn(PackageManager.PERMISSION_DENIED); when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_4_UID)) .thenReturn(PackageManager.PERMISSION_GRANTED); - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_5_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_5_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); // app3 and app5 were installed by enterprise policy. @@ -168,11 +168,11 @@ public final class AppWithAdminGrantedPermissionsListerTest { buildInfo(APP_6_UID, APP_6, 0 /* flags */, Build.VERSION_CODES.M))); // Grant run-time permissions as appropriate. - when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), anyObject())) + when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), any())) .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED); // Grant install-time permissions as appropriate. - when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_6_UID))) + when(mPackageManagerService.checkUidPermission(any(), eq(APP_6_UID))) .thenReturn(PackageManager.PERMISSION_DENIED); // app6 was not installed by enterprise policy. @@ -202,7 +202,7 @@ public final class AppWithAdminGrantedPermissionsListerTest { verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID)); verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MANAGED_PROFILE_ID)); - verify(mPackageManager, atLeast(0)).getInstallReason(anyObject(), anyObject()); + verify(mPackageManager, atLeast(0)).getInstallReason(any(), any()); verifyNoMoreInteractions(mPackageManager); } diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java index e2aed368f80..602d678c9d8 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java @@ -20,11 +20,11 @@ import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; import static com.google.common.truth.Truth.assertThat; -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.any; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.argThat; import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -170,7 +170,7 @@ public final class InstalledAppListerTest { verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID)); verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MANAGED_PROFILE_ID)); verify(mPackageManager, atLeast(0)) - .queryIntentActivitiesAsUser(anyObject(), anyInt(), anyInt()); + .queryIntentActivitiesAsUser(any(), anyInt(), anyInt()); } public static boolean checkAppFound(List mInstalledAppList, String appId, diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java index e0a08364a8c..da5ada783ad 100644 --- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java index 3e46027c362..178a26f8453 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java @@ -24,7 +24,7 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.Manifest; @@ -142,6 +142,6 @@ public class DefaultAssistPreferenceControllerTest { controller.getSettingIntent(null); - verifyZeroInteractions(assistUtils); + verifyNoInteractions(assistUtils); } } diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java index a7b7e85d063..4ea05ee7108 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java @@ -18,9 +18,9 @@ package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import android.content.Intent; @@ -101,4 +101,4 @@ public class FingerprintEnrollEnrollingTest { return callbackCaptor.getValue(); } -} \ No newline at end of file +} diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java index 55f0210dad4..ec17a8602c0 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java @@ -19,9 +19,9 @@ package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import static org.robolectric.RuntimeEnvironment.application; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java index fac8b584f0a..81f485986b9 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java @@ -21,8 +21,8 @@ import static android.bluetooth.BluetoothDevice.BOND_NONE; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java index f2b0acddbed..37b8ab630fb 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java @@ -40,7 +40,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.content.Context; @@ -268,7 +268,7 @@ public class DashboardFeatureProviderImplTest { mImpl.bindPreferenceToTileAndGetObservers(mActivity, mFragment, mForceRoundedIcon, null /* keys */, tile, "123", Preference.DEFAULT_ORDER); - verifyZeroInteractions(tile); + verifyNoInteractions(tile); } @Test diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java index 483d74638a7..47db4f29506 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java @@ -19,14 +19,14 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java index 861b4e395fa..cef5928c717 100644 --- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java @@ -19,16 +19,15 @@ import static android.net.NetworkPolicy.CYCLE_NONE; 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.anyLong; -import static org.mockito.ArgumentMatchers.anyObject; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.nullable; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyLong; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; +import static org.mockito.Mockito.nullable; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -133,9 +132,9 @@ public class BillingCycleSettingsTest { mDataLimit, mDataWarning, mEnableDataLimit, mEnableDataWarning); doReturn("some-string").when(billingCycleSettings).getString(anyInt(), anyInt()); - when(mNetworkPolicyEditor.getPolicyCycleDay(anyObject())).thenReturn(CYCLE_NONE + 1); - when(mNetworkPolicyEditor.getPolicyLimitBytes(anyObject())).thenReturn(2000L); - when(mNetworkPolicyEditor.getPolicyWarningBytes(anyObject())).thenReturn(1000L); + when(mNetworkPolicyEditor.getPolicyCycleDay(any())).thenReturn(CYCLE_NONE + 1); + when(mNetworkPolicyEditor.getPolicyLimitBytes(any())).thenReturn(2000L); + when(mNetworkPolicyEditor.getPolicyWarningBytes(any())).thenReturn(1000L); billingCycleSettings.updatePrefs(); diff --git a/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java b/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java index 70a1a38fa0e..4391425d2ba 100644 --- a/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java +++ b/tests/robotests/src/com/android/settings/datausage/lib/DataUsageLibTest.java @@ -18,7 +18,7 @@ package com.android.settings.datausage.lib; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java index b9c4edc9af2..9fb364ed62e 100644 --- a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java @@ -24,7 +24,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.app.time.Capabilities; @@ -99,7 +99,7 @@ public class LocationTimeZoneDetectionPreferenceControllerTest { mController.setChecked(true); // Verify the TimeManager was not called. - verifyZeroInteractions(mTimeManager); + verifyNoInteractions(mTimeManager); } @Test diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java index 3f49b15b634..35e044cc2f3 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceControllerTest.java @@ -23,8 +23,8 @@ import static com.android.settings.deviceinfo.firmwareversion.MainlineModuleVers import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java index 09d1c84f994..06e41073716 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java @@ -18,10 +18,10 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyObject; -import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -79,7 +79,7 @@ public abstract class AdminGrantedPermissionsPreferenceControllerTestBase { } }).when(mFeatureFactory.applicationFeatureProvider) .calculateNumberOfAppsWithAdminGrantedPermissions(eq(mPermissions), - eq(async), anyObject()); + eq(async), any()); } @Test diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java index f39b4b8821b..c32d2d79256 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.anyObject; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.eq; @@ -74,7 +74,7 @@ public class EnterpriseInstalledPackagesPreferenceControllerTest { return null; } }).when(mFeatureFactory.applicationFeatureProvider) - .calculateNumberOfPolicyInstalledApps(eq(async), anyObject()); + .calculateNumberOfPolicyInstalledApps(eq(async), any()); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index 269c810f852..39f2ce5f314 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java @@ -30,7 +30,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.app.AppOpsManager; @@ -45,7 +45,6 @@ import android.os.BatteryStats; import android.os.Bundle; import android.os.Process; import android.os.UserHandle; -import android.util.Pair; import androidx.fragment.app.FragmentActivity; import androidx.loader.app.LoaderManager; @@ -858,7 +857,7 @@ public class AdvancedPowerUsageDetailTest { mFragment.onRadioButtonClicked(mOptimizePreference); mFragment.onPause(); - verifyZeroInteractions(mMetricsFeatureProvider); + verifyNoInteractions(mMetricsFeatureProvider); } @Test @@ -869,7 +868,7 @@ public class AdvancedPowerUsageDetailTest { mFragment.notifyBackupManager(); - verifyZeroInteractions(mBackupManager); + verifyNoInteractions(mBackupManager); } @Test @@ -892,6 +891,6 @@ public class AdvancedPowerUsageDetailTest { mFragment.onPause(); - verifyZeroInteractions(mBackupManager); + verifyNoInteractions(mBackupManager); } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java index 46773c96622..406fe8ad29a 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java index ca1797ac9e9..256b621e60e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java @@ -33,7 +33,7 @@ import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import android.app.AppOpsManager; import android.app.backup.BackupDataInputStream; @@ -251,7 +251,7 @@ public final class BatteryBackupHelperTest { mBatteryBackupHelper.restoreEntity(mBackupDataInputStream); - verifyZeroInteractions(mBackupDataInputStream); + verifyNoInteractions(mBackupDataInputStream); } @Test @@ -289,13 +289,13 @@ public final class BatteryBackupHelperTest { @Test public void restoreOptimizationMode_nullBytesData_skipRestore() throws Exception { mBatteryBackupHelper.restoreOptimizationMode(new byte[0]); - verifyZeroInteractions(mBatteryOptimizeUtils); + verifyNoInteractions(mBatteryOptimizeUtils); mBatteryBackupHelper.restoreOptimizationMode("invalid data format".getBytes()); - verifyZeroInteractions(mBatteryOptimizeUtils); + verifyNoInteractions(mBatteryOptimizeUtils); mBatteryBackupHelper.restoreOptimizationMode(DELIMITER.getBytes()); - verifyZeroInteractions(mBatteryOptimizeUtils); + verifyNoInteractions(mBatteryOptimizeUtils); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java index 1d74491a0e1..3f54270ce26 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java @@ -18,18 +18,16 @@ package com.android.settings.fuelgauge; 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.anyLong; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyLong; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import android.app.settings.SettingsEnums; -import android.content.Context; import android.content.ContentValues; +import android.content.Context; import android.content.pm.PackageManager; import android.content.res.Configuration; import android.content.res.Resources; @@ -37,13 +35,11 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.LocaleList; import android.text.format.DateUtils; -import android.util.Pair; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; -import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.testutils.FakeFeatureFactory; @@ -58,11 +54,10 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.Locale; -import java.util.List; import java.util.Map; @RunWith(RobolectricTestRunner.class) diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryDiffEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryDiffEntryTest.java index 6ea13901eef..c9201c8d3f9 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryDiffEntryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryDiffEntryTest.java @@ -17,10 +17,10 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Matchers.anyInt; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.spy; import android.content.ContentValues; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java index 6389dc95fe1..78534e138f0 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java @@ -23,7 +23,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.app.Activity; @@ -267,7 +267,7 @@ public class BatteryHeaderPreferenceControllerTest { mController.updateHeaderByBatteryTips(null, mBatteryInfo); - verifyZeroInteractions(mBatteryUsageProgressBarPref); + verifyNoInteractions(mBatteryUsageProgressBarPref); } @Test @@ -277,7 +277,7 @@ public class BatteryHeaderPreferenceControllerTest { mController.updateHeaderByBatteryTips(lowBatteryTip, null); - verifyZeroInteractions(mBatteryUsageProgressBarPref); + verifyNoInteractions(mBatteryUsageProgressBarPref); } @Test diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java index c154f426b30..db58b630e65 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java @@ -22,11 +22,11 @@ import static com.android.settings.fuelgauge.BatteryOptimizeUtils.MODE_UNRESTRIC import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.app.AppOpsManager; @@ -169,7 +169,7 @@ public class BatteryOptimizeUtilsTest { mBatteryOptimizeUtils.setAppUsageState(MODE_UNRESTRICTED); TimeUnit.SECONDS.sleep(1); - verifyZeroInteractions(mMockBackend); - verifyZeroInteractions(mMockBatteryUtils); + verifyNoInteractions(mMockBackend); + verifyNoInteractions(mMockBatteryUtils); } } diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java index bafc021d9b2..9aa79ff4db6 100644 --- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java @@ -16,16 +16,15 @@ package com.android.settings.network; -import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import android.app.admin.DevicePolicyManager; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothPan; import android.bluetooth.BluetoothProfile; @@ -162,7 +161,7 @@ public class TetherPreferenceControllerTest { mController.onResume(); - verifyZeroInteractions(mPreference); + verifyNoInteractions(mPreference); Settings.Global.putInt(context.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1); diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java index 1660955e323..3791c23193e 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.notification.zen; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; @@ -42,10 +43,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.mockito.internal.util.reflection.FieldSetter; import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; +import java.lang.reflect.Field; import java.util.HashMap; import java.util.Map; @@ -192,16 +193,26 @@ public class ZenModeAutomaticRulesPreferenceControllerTest { rule.setEnabled(false); rMap.put(testId, rule); mockGetAutomaticZenRules(NUM_RULES, rMap); - FieldSetter.setField(mZenRulePreference, ZenRulePreference.class.getDeclaredField("mId"), testId); + setZenRulePreferenceField("mId", testId); mController.updateState(mockPref); verify(mZenRulePreference, times(1)).updatePreference(any()); verify(mockPref, never()).removeAll(); assertEquals(NUM_RULES, mController.mZenRulePreferences.size()); } + private void setZenRulePreferenceField(String name, Object value) { + try { + Field field = ZenRulePreference.class.getDeclaredField("mId"); + field.setAccessible(true); + field.set(mZenRulePreference, value); + } catch (ReflectiveOperationException e) { + fail("Unable to set mZenRulePreference field: " + name); + } + } + private void mockGetAutomaticZenRules(int numRules, Map rules) { Map.Entry[] arr = new Map.Entry[numRules]; rules.entrySet().toArray(arr); when(mBackend.getAutomaticZenRules()).thenReturn(arr); } -} \ No newline at end of file +} diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java index 6bf0538c33b..d5834f932c3 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceControllerTest.java @@ -26,7 +26,7 @@ import static com.android.settings.notification.zen.ZenModePriorityConversations import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; @@ -146,4 +146,4 @@ public class ZenModePriorityConversationsPreferenceControllerTest { } return null; } -} \ No newline at end of file +} diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java index 99fa8e6cdd4..c431c5332ab 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceControllerTest.java @@ -30,8 +30,8 @@ import static com.android.settings.notification.zen.ZenPrioritySendersHelper.KEY import static com.android.settings.notification.zen.ZenPrioritySendersHelper.KEY_NONE; import static com.android.settings.notification.zen.ZenPrioritySendersHelper.UNKNOWN; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Matchers.any; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java index 2f7dfe7f9b8..01f3dfabcb3 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.notification.zen; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java index 96036d52755..b5d07cc5231 100644 --- a/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java @@ -21,8 +21,8 @@ import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -72,7 +72,7 @@ public class PrintJobMessagePreferenceControllerTest { mPreference = new Preference(mContext); when(mContext.getSystemService(Context.PRINT_SERVICE)).thenReturn(mPrintManager); when(mPrintManager.getGlobalPrintManagerForUser(anyInt())).thenReturn(mPrintManager); - when(mPrintManager.getPrintJob(anyObject())).thenReturn(mPrintJob); + when(mPrintManager.getPrintJob(any())).thenReturn(mPrintJob); when(mPrintJob.getInfo()).thenReturn(mPrintJobInfo); mController = new PrintJobMessagePreferenceController(mContext, PREF_KEY); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); @@ -93,7 +93,7 @@ public class PrintJobMessagePreferenceControllerTest { @Test public void updateUi_visiblePreference() { - when(mPrintJobInfo.getStatus(anyObject())).thenReturn("TestPrint"); + when(mPrintJobInfo.getStatus(any())).thenReturn("TestPrint"); mLifecycle.handleLifecycleEvent(ON_START); assertThat(mPreference.isVisible()).isTrue(); @@ -103,7 +103,7 @@ public class PrintJobMessagePreferenceControllerTest { @Test public void updateUi_invisiblePreference() { - when(mPrintJobInfo.getStatus(anyObject())).thenReturn(null); + when(mPrintJobInfo.getStatus(any())).thenReturn(null); mLifecycle.handleLifecycleEvent(ON_START); assertThat(mPreference.isVisible()).isFalse(); diff --git a/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java index 09c5bf368af..da4d58c757b 100644 --- a/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java @@ -21,8 +21,8 @@ import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -75,7 +75,7 @@ public class PrintJobPreferenceControllerTest { mTestLabel = "PrintTest"; when(mContext.getSystemService(Context.PRINT_SERVICE)).thenReturn(mPrintManager); when(mPrintManager.getGlobalPrintManagerForUser(anyInt())).thenReturn(mPrintManager); - when(mPrintManager.getPrintJob(anyObject())).thenReturn(mPrintJob); + when(mPrintManager.getPrintJob(any())).thenReturn(mPrintJob); when(mPrintJob.getInfo()).thenReturn(mPrintJobInfo); mController = new PrintJobPreferenceController(mContext, PREF_KEY); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java index c646a935192..2a7bd29a964 100644 --- a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java +++ b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java @@ -21,7 +21,7 @@ import static com.android.settings.search.actionbar.SearchMenuController.MENU_SE import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.app.settings.SettingsEnums; @@ -91,7 +91,7 @@ public class SearchMenuControllerTest { SearchMenuController.init(mHost); mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */); - verifyZeroInteractions(mMenu); + verifyNoInteractions(mMenu); } @Test @@ -100,7 +100,7 @@ public class SearchMenuControllerTest { SearchMenuController.init(mHost); mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */); - verifyZeroInteractions(mMenu); + verifyNoInteractions(mMenu); } @Test @@ -112,6 +112,6 @@ public class SearchMenuControllerTest { mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */); - verifyZeroInteractions(mMenu); + verifyNoInteractions(mMenu); } } diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java index 62c7bd8091c..e297b788af9 100644 --- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java +++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java @@ -26,7 +26,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import android.content.Context; @@ -111,7 +111,7 @@ public class HighlightablePreferenceGroupAdapterTest { ReflectionHelpers.setField(mAdapter, "mHighlightRequested", false); mAdapter.requestHighlight(mRoot, null /* recyclerView */, mock(AppBarLayout.class)); - verifyZeroInteractions(mRoot); + verifyNoInteractions(mRoot); } @Test @@ -125,7 +125,7 @@ public class HighlightablePreferenceGroupAdapterTest { when(mFragment.getArguments()).thenReturn(null); when(mFragment.getPreferenceScreen()).thenReturn(screen); HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(mFragment); - verifyZeroInteractions(screen); + verifyNoInteractions(screen); } @Test @@ -150,7 +150,7 @@ public class HighlightablePreferenceGroupAdapterTest { HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(mFragment); verify(mFragment).getInitialExpandedChildCount(); - verifyZeroInteractions(screen); + verifyNoInteractions(screen); } @Test diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java index e08a14a469d..66d399c8192 100644 --- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java @@ -173,7 +173,7 @@ public class NetworkRequestDialogFragmentTest { } private List createWifiEntryList() { - List wifiEntryList = spy(new ArrayList<>()); + List wifiEntryList = new ArrayList<>(); final WifiEntry wifiEntry1 = mock(WifiEntry.class); when(wifiEntry1.getSsid()).thenReturn("Test AP 1"); diff --git a/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java b/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java index 8478a5471ac..610e520e49b 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java @@ -21,9 +21,9 @@ import static com.android.settings.wifi.calling.DisclaimerItemListAdapter import static com.android.settings.wifi.calling.DisclaimerItemListAdapter .DisclaimerItemViewHolder.ID_DISCLAIMER_ITEM_TITLE; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -75,7 +75,7 @@ public class DisclaimerItemListAdapterTest { mDisclaimerItem = spy(new MockDisclaimerItem(mContext, 0 /* subId */)); mDisclaimerItemList.add(mDisclaimerItem); - when(mLayoutInflater.inflate(anyInt(), anyObject(), anyBoolean())).thenReturn(mView); + when(mLayoutInflater.inflate(anyInt(), any(), anyBoolean())).thenReturn(mView); when(mViewGroup.getContext()).thenReturn(mContext); when(mViewGroup.getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE)).thenReturn( mLayoutInflater); diff --git a/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java b/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java index 985edda69b5..c8e4cce6d0a 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java @@ -18,8 +18,8 @@ package com.android.settings.wifi.calling; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java b/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java index 3fe9678c26e..148095aac02 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java @@ -18,8 +18,8 @@ package com.android.settings.wifi.calling; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java index 207a2318c61..0ece537371f 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java @@ -16,10 +16,9 @@ package com.android.settings.wifi.calling; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -95,7 +94,7 @@ public class WifiCallingDisclaimerFragmentTest { doReturn(mActivity).when(mFragment).getActivity(); - when(mLayoutInflater.inflate(anyInt(), anyObject(), anyBoolean())).thenReturn(mView); + when(mLayoutInflater.inflate(anyInt(), any(), anyBoolean())).thenReturn(mView); when(mView.findViewById(R.id.agree_button)).thenReturn(mAgreeButton); when(mView.findViewById(R.id.disagree_button)).thenReturn(mDisagreeButton); when(mView.findViewById(R.id.disclaimer_item_list)).thenReturn(mRecyclerView); diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java index e2c5ca33b4c..1faa611b970 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java @@ -16,17 +16,17 @@ package com.android.settings.wifi.calling; -import static junit.framework.Assert.assertEquals; - import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT; 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 junit.framework.Assert.assertEquals; + +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -44,7 +44,6 @@ import android.telephony.CarrierConfigManager; import android.telephony.TelephonyManager; import android.telephony.ims.ImsMmTelManager; import android.view.View; -import android.widget.TextView; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java index 08bcd2a2912..b0a50c81fa8 100644 --- a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java +++ b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java @@ -17,15 +17,16 @@ package com.android.settings.wifi.details2; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.nullable; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; +import static org.mockito.Mockito.nullable; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -92,7 +93,6 @@ import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.InOrder; -import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; @@ -1253,7 +1253,7 @@ public class WifiDetailPreferenceController2Test { mMockWifiConfig.creatorUid = doUid; ComponentName doComponent = new ComponentName(doPackage, "some.Class"); try { - when(mMockPackageManager.getPackageUidAsUser(Matchers.anyString(), Matchers.anyInt())) + when(mMockPackageManager.getPackageUidAsUser(anyString(), anyInt())) .thenReturn(doUid); } catch (PackageManager.NameNotFoundException e) { //do nothing From c89755525f419cba43968898df151dab2853eca6 Mon Sep 17 00:00:00 2001 From: Jason Chiu Date: Wed, 6 Jul 2022 16:53:59 +0800 Subject: [PATCH 08/10] Update all preferences when the account preference updates UI When an account is added or removed, the account preference controller just updates the account list, whereas there's no trigger point for the account data sync preferences to refresh. Add an API to update all preferences in DashboardFragment, so we can refresh the account sync preferences whenever the account list is updated. Bug: 185479221 Test: robotest, manual Change-Id: Ide3d972abae09ce0175e3bafbb1f4a5e307d20c8 --- .../accounts/AccountDashboardFragment.java | 3 +-- .../AccountPersonalDashboardFragment.java | 3 +-- .../accounts/AccountPreferenceController.java | 12 ++++++---- .../AccountWorkProfileDashboardFragment.java | 3 +-- .../settings/dashboard/DashboardFragment.java | 24 +++++++++++++++++++ .../AutoSyncWorkDataPreferenceController.java | 4 +++- .../AccountPreferenceControllerTest.java | 4 ++-- .../dashboard/DashboardFragmentTest.java | 8 +++++++ 8 files changed, 47 insertions(+), 14 deletions(-) diff --git a/src/com/android/settings/accounts/AccountDashboardFragment.java b/src/com/android/settings/accounts/AccountDashboardFragment.java index a2b6182a715..5456f0ac694 100644 --- a/src/com/android/settings/accounts/AccountDashboardFragment.java +++ b/src/com/android/settings/accounts/AccountDashboardFragment.java @@ -26,7 +26,6 @@ import android.os.UserHandle; import android.os.UserManager; import com.android.settings.R; -import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.autofill.PasswordsPreferenceController; import com.android.settings.applications.defaultapps.DefaultAutofillPreferenceController; import com.android.settings.applications.defaultapps.DefaultWorkAutofillPreferenceController; @@ -96,7 +95,7 @@ public class AccountDashboardFragment extends DashboardFragment { } private static void buildAccountPreferenceControllers( - Context context, SettingsPreferenceFragment parent, String[] authorities, + Context context, DashboardFragment parent, String[] authorities, List controllers) { final AccountPreferenceController accountPrefController = new AccountPreferenceController(context, parent, authorities, diff --git a/src/com/android/settings/accounts/AccountPersonalDashboardFragment.java b/src/com/android/settings/accounts/AccountPersonalDashboardFragment.java index 9ad12067233..4661c6416e7 100644 --- a/src/com/android/settings/accounts/AccountPersonalDashboardFragment.java +++ b/src/com/android/settings/accounts/AccountPersonalDashboardFragment.java @@ -24,7 +24,6 @@ import android.app.settings.SettingsEnums; import android.content.Context; import com.android.settings.R; -import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.autofill.PasswordsPreferenceController; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.profileselector.ProfileSelectFragment; @@ -78,7 +77,7 @@ public class AccountPersonalDashboardFragment extends DashboardFragment { } private static void buildAccountPreferenceControllers( - Context context, SettingsPreferenceFragment parent, String[] authorities, + Context context, DashboardFragment parent, String[] authorities, List controllers) { final AccountPreferenceController accountPrefController = new AccountPreferenceController(context, parent, authorities, diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java index 145898869fb..8c717f03e77 100644 --- a/src/com/android/settings/accounts/AccountPreferenceController.java +++ b/src/com/android/settings/accounts/AccountPreferenceController.java @@ -58,10 +58,10 @@ import androidx.preference.PreferenceScreen; import com.android.settings.AccessiblePreferenceCategory; import com.android.settings.R; -import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.SubSettingLauncher; +import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.profileselector.ProfileSelectFragment; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.RestrictedPreference; @@ -101,7 +101,7 @@ public class AccountPreferenceController extends AbstractPreferenceController private Preference mProfileNotAvailablePreference; private String[] mAuthorities; private int mAuthoritiesCount = 0; - private SettingsPreferenceFragment mFragment; + private DashboardFragment mFragment; private int mAccountProfileOrder = ORDER_ACCOUNT_PROFILES; private AccountRestrictionHelper mHelper; private MetricsFeatureProvider mMetricsFeatureProvider; @@ -145,13 +145,13 @@ public class AccountPreferenceController extends AbstractPreferenceController public ArrayMap accountPreferences = new ArrayMap<>(); } - public AccountPreferenceController(Context context, SettingsPreferenceFragment parent, + public AccountPreferenceController(Context context, DashboardFragment parent, String[] authorities, @ProfileSelectFragment.ProfileType int type) { this(context, parent, authorities, new AccountRestrictionHelper(context), type); } @VisibleForTesting - AccountPreferenceController(Context context, SettingsPreferenceFragment parent, + AccountPreferenceController(Context context, DashboardFragment parent, String[] authorities, AccountRestrictionHelper helper, @ProfileSelectFragment.ProfileType int type) { super(context); @@ -314,6 +314,9 @@ public class AccountPreferenceController extends AbstractPreferenceController for (int i = 0; i < profilesCount; i++) { updateAccountTypes(mProfiles.valueAt(i)); } + + // Refresh for the auto-sync preferences + mFragment.forceUpdatePreferences(); } private void updateProfileUi(final UserInfo userInfo) { @@ -409,7 +412,6 @@ public class AccountPreferenceController extends AbstractPreferenceController return preference; } - private Preference newManagedProfileSettings() { Preference preference = new Preference(mFragment.getPreferenceManager().getContext()); preference.setKey(PREF_KEY_WORK_PROFILE_SETTING); diff --git a/src/com/android/settings/accounts/AccountWorkProfileDashboardFragment.java b/src/com/android/settings/accounts/AccountWorkProfileDashboardFragment.java index 1fdd3f6c428..f64e0416163 100644 --- a/src/com/android/settings/accounts/AccountWorkProfileDashboardFragment.java +++ b/src/com/android/settings/accounts/AccountWorkProfileDashboardFragment.java @@ -24,7 +24,6 @@ import android.app.settings.SettingsEnums; import android.content.Context; import com.android.settings.R; -import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.autofill.PasswordsPreferenceController; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.profileselector.ProfileSelectFragment; @@ -78,7 +77,7 @@ public class AccountWorkProfileDashboardFragment extends DashboardFragment { } private static void buildAccountPreferenceControllers( - Context context, SettingsPreferenceFragment parent, String[] authorities, + Context context, DashboardFragment parent, String[] authorities, List controllers) { final AccountPreferenceController accountPrefController = new AccountPreferenceController(context, parent, authorities, diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java index fb0a09d47a7..9d1ed7c6bea 100644 --- a/src/com/android/settings/dashboard/DashboardFragment.java +++ b/src/com/android/settings/dashboard/DashboardFragment.java @@ -415,6 +415,30 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment updatePreferenceVisibility(mPreferenceControllers); } + /** + * Force update all the preferences in this fragment. + */ + public void forceUpdatePreferences() { + final PreferenceScreen screen = getPreferenceScreen(); + if (screen == null || mPreferenceControllers == null) { + return; + } + for (List controllerList : mPreferenceControllers.values()) { + for (AbstractPreferenceController controller : controllerList) { + final String key = controller.getPreferenceKey(); + final Preference preference = findPreference(key); + if (preference == null) { + continue; + } + final boolean available = controller.isAvailable(); + if (available) { + controller.updateState(preference); + } + preference.setVisible(available); + } + } + } + @VisibleForTesting void updatePreferenceVisibility( Map> preferenceControllers) { diff --git a/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java b/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java index fb571734331..9ac1b87112b 100644 --- a/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java +++ b/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java @@ -22,7 +22,8 @@ import androidx.preference.PreferenceFragmentCompat; import com.android.settings.Utils; -public class AutoSyncWorkDataPreferenceController extends AutoSyncPersonalDataPreferenceController { +/** An account sync data preference controller for work */ +public class AutoSyncWorkDataPreferenceController extends AutoSyncDataPreferenceController { private static final String KEY_AUTO_SYNC_WORK_ACCOUNT = "auto_sync_work_account_data"; @@ -38,6 +39,7 @@ public class AutoSyncWorkDataPreferenceController extends AutoSyncPersonalDataPr @Override public boolean isAvailable() { + mUserHandle = Utils.getManagedProfileWithDisabled(mUserManager); return mUserHandle != null && !mUserManager.isManagedProfile() && !mUserManager.isLinkedUser() && mUserManager.getProfiles(UserHandle.myUserId()).size() > 1; } diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java index b22b1562be2..89e00e12c7d 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java @@ -45,7 +45,7 @@ import androidx.preference.PreferenceScreen; import com.android.settings.AccessiblePreferenceCategory; import com.android.settings.R; -import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.profileselector.ProfileSelectFragment; import com.android.settings.testutils.shadow.ShadowAccountManager; import com.android.settings.testutils.shadow.ShadowContentResolver; @@ -77,7 +77,7 @@ public class AccountPreferenceControllerTest { @Mock(answer = RETURNS_DEEP_STUBS) private UserManager mUserManager; @Mock(answer = RETURNS_DEEP_STUBS) - private SettingsPreferenceFragment mFragment; + private DashboardFragment mFragment; @Mock(answer = RETURNS_DEEP_STUBS) private AccountManager mAccountManager; @Mock(answer = RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java index 894a6c557df..fd6689a50a1 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java @@ -297,6 +297,14 @@ public class DashboardFragmentTest { mTestFragment.updatePreferenceVisibility(prefControllers); } + @Test + public void forceUpdatePreferences_prefKeyNull_shouldNotCrash() { + mTestFragment.addPreferenceController(new TestPreferenceController(mContext)); + + // Should not crash + mTestFragment.forceUpdatePreferences(); + } + @Test public void checkUiBlocker_noUiBlocker_controllerIsNull() { mTestFragment.mBlockerController = null; From db7f7b6d31f49258bdae86027c7aa32df6db7f18 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 19 Jul 2022 13:59:24 -0700 Subject: [PATCH 09/10] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I2ca813a72a28c275eacf6dda32ad36d491aa48b9 --- res/values-af/strings.xml | 2 +- res/values-de/strings.xml | 2 +- res/values-es/strings.xml | 24 ++++++++++++------------ res/values-fr/strings.xml | 3 +-- res/values-gl/strings.xml | 6 +++--- res/values-gu/strings.xml | 2 +- res/values-hi/strings.xml | 6 +++--- res/values-it/strings.xml | 6 +++--- res/values-ko/strings.xml | 2 +- res/values-ky/strings.xml | 8 ++++---- res/values-mk/strings.xml | 4 ++-- res/values-mr/strings.xml | 2 +- res/values-my/strings.xml | 14 +++++++------- res/values-nl/strings.xml | 2 +- res/values-or/strings.xml | 14 +++++++------- res/values-pa/strings.xml | 16 ++++++++-------- res/values-ru/strings.xml | 2 +- res/values-te/strings.xml | 2 +- res/values-uk/strings.xml | 10 +++++----- res/values-zh-rTW/strings.xml | 2 +- 20 files changed, 64 insertions(+), 65 deletions(-) diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index b1a972688fa..9c43f65a8b8 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -418,7 +418,7 @@ "Vereis altyd bevestigingstap as Gesigslot in programme gebruik word" "Vee gesigmodel uit" "Stel Gesigslot op" - "Gebruik jou gesig om jou foon te ontsluit of vir stawing in programme, soos wanneer jy aanmeld of \'n aankoop goedkeur.\n\nHou in gedagte:\nJy kan slegs een gesig op \'n slag gestel hê. Om nog \'n gesig by te voeg, moet jy die huidige een uitvee.\n\nAs jy na die foon kyk, kan dit ontsluit word wanneer jy nie bedoel om dit te doen nie.\n\nIemand anders kan jou foon ontsluit as dit voor jou gesig gehou word.\n\nIemand ander wat baie soos jy lyk, soos \'n identiese broer of suster, kan jou foon ontsluit." + "Gebruik jou gesig om jou foon te ontsluit of vir stawing in programme, soos wanneer jy aanmeld of \'n aankoop goedkeur.\n\nHou in gedagte:\nJy kan slegs een gesig op \'n slag gestel hê. Om nog \'n gesig by te voeg, moet jy die huidige een uitvee.\n\nAs jy na die foon kyk, kan dit ontsluit word wanneer jy nie bedoel om dit te doen nie.\n\nIemand anders kan jou foon ontsluit as dit voor jou gesig gehou word.\n\nIemand anders wat baie soos jy lyk, soos \'n identiese broer of suster, kan jou foon ontsluit." "Gebruik jou gesig om jou foon te ontsluit of vir stawing in programme, soos wanneer jy aanmeld of \'n aankoop goedkeur.\n\nHou in gedagte:\nJy kan slegs een gesig op \'n slag gestel hê. Om nog \'n gesig by te voeg, moet jy die huidige een uitvee.\n\nAs jy na die foon kyk, kan dit ontsluit word wanneer jy nie bedoel om dit te doen nie.\n\nIemand anders kan jou foon ontsluit as dit voor jou gesig gehou word, selfs as jou oë toe is.\n\nIemand ander wat baie soos jy lyk, soos \'n identiese broer of suster, kan jou foon ontsluit." "Vee gesigmodel uit?" "Jou gesigmodel sal permanent en veilig uitgevee word. \n\nNadat dit uitgevee is, sal jy jou PIN, patroon of wagwoord nodig hê om jou foon te ontsluit of vir stawing in programme." diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 563cc952125..cfc999a3b71 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -418,7 +418,7 @@ "Bei Gesichtsentsperrung in Apps immer Bestätigung anfordern" "Gesichtsmodell löschen" "Gesichtsentsperrung einrichten" - "Du kannst die Entsperrung per Gesichtserkennung zum Entsperren deines Smartphones oder zur Authentifizierung in Apps verwenden, beispielsweise um dich anzumelden oder um Käufe zu autorisieren.\n\nHinweis:\nEs kann immer nur jeweils ein Gesicht eingerichtet sein. Wenn du ein anderes hinzufügen möchtest, lösche zuerst das aktuelle.\n\nEs kann passieren, dass das Smartphone unbeabsichtigt entsperrt wird, wenn du auf das Gerät blickst.\n\nEine andere Person kann dein Smartphone dadurch entsperren, dass sie es vor dein Gesicht hält.\n\nDein Smartphone kann eventuell auch von jemandem entsperrt werden, der dir sehr ähnlich sieht, beispielsweise von einem eineiigen Zwilling." + "Du kannst die Entsperrung per Gesichtserkennung zum Entsperren deines Smartphones oder zur Authentifizierung in Apps verwenden, beispielsweise um dich anzumelden oder um Käufe zu autorisieren.\n\nHinweis:\nEs kann immer nur jeweils ein Gesicht eingerichtet sein. Wenn du ein anderes hinzufügen möchtest, lösche zuerst das aktuelle.\n\nEs kann passieren, dass das Smartphone unbeabsichtigt entsperrt wird, wenn du auf das Gerät blickst.\n\nEine andere Person kann dein Smartphone entsperren, indem sie es vor dein Gesicht hält.\n\nDein Smartphone kann eventuell auch von jemandem entsperrt werden, der dir sehr ähnlich sieht, beispielsweise von einem eineiigen Zwilling." "Du kannst die Entsperrung per Gesichtserkennung zum Entsperren deines Smartphones oder zur Authentifizierung in Apps verwenden, beispielsweise um dich anzumelden oder um Käufe zu autorisieren.\n\nHinweis:\nEs kann immer nur jeweils ein Gesicht eingerichtet sein. Wenn du ein anderes hinzufügen möchtest, lösche zuerst das aktuelle.\n\nEs kann passieren, dass das Smartphone unbeabsichtigt entsperrt wird, wenn du auf das Gerät blickst.\n\nEine andere Person kann dein Smartphone dadurch entsperren, dass sie es vor dein Gesicht hält, auch wenn deine Augen geschlossen sind.\n\nDein Smartphone kann eventuell auch von jemandem entsperrt werden, der dir sehr ähnlich sieht, beispielsweise von einem eineiigen Zwilling." "Gesichtsmodell löschen?" "Dein Gesichtsmodell wird dauerhaft und sicher gelöscht.\n\nNach dem Löschen benötigst du deine PIN, dein Muster oder dein Passwort, um dein Smartphone zu entsperren und dich in Apps zu authentifizieren." diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 478a8627a63..b8ab7975235 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -44,7 +44,7 @@ "Suspendido" "Desconocido" "Desconectar USB" - "Desconectar tarjeta SD" + "Desmontar tarjeta SD" "Borrar almacenamiento USB" "Borrar tarjeta SD" "Vista previa" @@ -1531,7 +1531,7 @@ "Almacenamiento y caché" "Almacenamiento" "Ajustes de almacenamiento" - "Desconectar almacenamiento USB, ver almacenamiento disponible" + "Desmontar almacenamiento USB, ver almacenamiento disponible" "Desconectar tarjeta SD, ver almacenamiento disponible." "IMEI (ranura SIM %1$d)" "Para verla, selecciona una red guardada" @@ -1582,9 +1582,9 @@ "Audio (música, tonos, etc.)" "Otros archivos" "Datos almacenados en caché" - "Desconectar almacenamiento compartido" - "Desconectar tarjeta SD" - "Desconectar almacenamiento USB interno" + "Desmontar almacenamiento compartido" + "Desmontar tarjeta SD" + "Desmontar almacenamiento USB interno" "Desconectar la tarjeta SD para extraerla de forma segura" "Inserta USB para activar almacenamiento" "Insertar una tarjeta SD para el montaje" @@ -1597,14 +1597,14 @@ "Borrar todos los datos del almacenamiento USB del teléfono, como la música y las fotos" "Borrar todos los datos de la tarjeta SD, como la música y las fotos" "La función MTP o PTP está activa." - "¿Desconectar almacenamiento USB?" - "¿Desconectar tarjeta SD?" - "Si desconectas el almacenamiento USB, se detendrán algunas aplicaciones que estás usando y no estarán disponibles hasta que vuelvas a activarlo." - "Si desconectas la tarjeta SD, se detendrán algunas aplicaciones en ejecución y no estarán disponibles hasta que la vuelvas a activar." + "¿Desmontar almacenamiento USB?" + "¿Desmontar tarjeta SD?" + "Si desmontas el almacenamiento USB, se detendrán algunas aplicaciones que estás usando y no estarán disponibles hasta que vuelvas a activarlo." + "Si desmontas la tarjeta SD, se detendrán algunas aplicaciones en ejecución y no estarán disponibles hasta que la vuelvas a activar." - "No se ha podido desconectar el almacenamiento USB. Inténtalo de nuevo más tarde." - "No se ha podido desconectar la tarjeta SD. Inténtalo de nuevo más tarde." + "No se ha podido desmontar el almacenamiento USB. Inténtalo de nuevo más tarde." + "No se ha podido desmontar la tarjeta SD. Inténtalo de nuevo más tarde." "Se desactivará el almacenamiento USB." "Se desactivará la tarjeta SD." "Desactivando" @@ -3926,7 +3926,7 @@ "Luz parpadeante" "Privacidad" "Saltar pantalla de bloqueo" - "Después de desbloquear, ir a la última pantalla usada" + "Después de desbloquear, ir a la última pantalla usada." "Pantalla de bloqueo, pantalla bloqueo, saltar, evitar" "Con el perfil de trabajo bloqueado" "Notificaciones en pantalla de bloqueo" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 448921f4000..868569defa1 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -1325,8 +1325,7 @@ "En savoir plus sur la rotation automatique" "Quand vous basculez votre téléphone en mode portrait ou paysage" "Résolution d\'écran" - - + "Haute résolution" "Pleine résolution" "FHD+ 1080p" "QHD+ 1440p" diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index 5b9b9f3721a..3e70015d5b3 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -1204,7 +1204,7 @@ "Outros dispositivos poden conectarse á zona wifi %1$s" "Contrasinal da zona wifi" "Banda do punto de acceso" - "Utiliza a zona wifi para crear unha rede wifi para os teus outros dispositivos. A zona wifi ofrece acceso a Internet a través da túa conexión de datos móbiles. É posible que se apliquen cargos de datos móbiles adicionais." + "Utiliza a zona wifi para crear unha rede wifi para os teus outros dispositivos. A zona wifi ofrece acceso a Internet a través da túa conexión de datos móbiles. É posible que se apliquen cargos adicionais polo uso de datos móbiles." "As aplicacións poden crear unha zona wifi para compartir contido cos dispositivos que están cerca." "Desactivar a zona wifi automaticamente" "Se non hai ningún dispositivo conectado" @@ -1501,7 +1501,7 @@ "Selecciona a SIM que prefiras usar para os datos móbiles." "Usar %1$s para os datos móbiles?" "Estás utilizando %2$s para os datos móbiles. Se cambias a %1$s, deixarase de utilizar %2$s para os datos móbiles." - "Utilizar %1$s" + "Usar %1$s" "Actualizar a SIM preferida?" "A única SIM do dispositivo é: %1$s. Queres usar esta SIM para os datos móbiles, as chamadas e as mensaxes SMS?" "Código PIN da SIM incorrecto. Agora debes contactar co operador para desbloquear o dispositivo." @@ -2485,7 +2485,7 @@ "Vibración do ton" "Vibración das notificacións" "Reacción aos toques" - "Utilizar %1$s" + "Usar %1$s" "Abrir %1$s" "Engadiuse %1$s ao menú Configuración rápida. Pasa o dedo cara abaixo para activar ou desactivar a función cando queiras." "Tamén podes engadir %1$s ao menú Configuración rápida desde a parte superior da pantalla" diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml index 3cbeced1542..ca1accf8ad5 100644 --- a/res/values-gu/strings.xml +++ b/res/values-gu/strings.xml @@ -1954,7 +1954,7 @@ "તમારો પાસવર્ડ ફરી દાખલ કરો" "ઑફિસની પ્રોફાઇલનો પાસવર્ડ ફરી દાખલ કરો" "તમારા કાર્યાલયનો પાસવર્ડ દાખલ કરો" - "તમારી પૅટર્નની પુષ્ટિ કરો" + "તમારી પૅટર્ન કન્ફર્મ કરો" "કાર્યાલયની પૅટર્ન દાખલ કરો" "તમારો પિન ફરી દાખલ કરો" "ઑફિસની પ્રોફાઇલનો પિન ફરી દાખલ કરો" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 101aa8ae02d..731d8321050 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -347,13 +347,13 @@ "फ़ेस अनलॉक की सुविधा सेट अप करने के लिए टैप करें" "फ़ेस अनलॉक" "वर्क प्रोफ़ाइल के लिए फ़ेस अनलॉक" - "फ़ेस अनलॉक की सुविधा सेट अप करने का तरीका" + "फ़ेस अनलॉक की सुविधा सेटअप करने का तरीका" "फे़स अनलॉक की सुविधा सेट अप करें" "चेहरे का इस्तेमाल कर पुष्टि करें" "शुरू करें" - "अगर सुलभता सुविधा में फ़ेस अनलॉक की सुविधा बंद है, तो हो सकता है कि सेटअप के कुछ चरण, टॉकबैक के साथ ठीक से काम न करें." + "अगर सुलभता सुविधा में फ़ेस अनलॉक की सुविधा बंद है, तो हो सकता है कि सेटअप के कुछ चरण, TalkBack के साथ ठीक से काम न करें." "वापस जाएं" "सेट अप जारी रखें" "सुलभता सेटअप का इस्तेमाल करें" @@ -2311,7 +2311,7 @@ "डाउनलोड किए गए ऐप्लिकेशन" "प्रयोग के लिए" "सुविधाएं दिखाने वाले फ़्लैग" - "टॉकबैक" + "TalkBack" "स्क्रीन रीडर खास तौर पर दृष्टिहीन और कमज़ोर नज़र वाले लोगों के लिए है" "अपनी स्क्रीन पर दिए गए आइटम तेज़ आवाज़ में सुनने के लिए उन पर टैप करें" "कैप्शन की सेटिंग" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 3a315ca2485..e8e7d38534e 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -418,8 +418,8 @@ "Chiedi sempre conferma se viene usato sblocco con il volto nelle app" "Elimina il modello del volto" "Configura lo sblocco con il volto" - "Usa il tuo volto per sbloccare il telefono o per l\'autenticazione nelle app, ad esempio per accedere o approvare un acquisto.\n\nTieni presente che:\nPuoi configurare un solo volto alla volta. Per aggiungere un altro volto devi eliminare quello attuale.\n\nSe guardi direttamente il telefono, potresti sbloccarlo anche senza volerlo.\n\nIl tuo telefono può essere sbloccato da un\'altra persona se viene rivolto verso il tuo viso.\n\nIl tuo telefono può essere sbloccato da qualcuno che ti assomiglia molto, ad esempio un fratello gemello." - "Usa il tuo volto per sbloccare il telefono o per l\'autenticazione nelle app, ad esempio per accedere o approvare un acquisto.\n\nTieni presente che:\nPuoi configurare un solo volto alla volta. Per aggiungere un altro volto devi eliminare quello attuale.\n\nSe guardi direttamente il telefono, potresti sbloccarlo anche senza volerlo.\n\nIl tuo telefono può essere sbloccato da un\'altra persona se viene rivolto verso il tuo viso, anche se hai gli occhi chiusi.\n\nIl tuo telefono può essere sbloccato da qualcuno che ti assomiglia molto, ad esempio un fratello gemello." + "Usa il tuo volto per sbloccare il telefono o per l\'autenticazione nelle app, ad esempio per accedere o approvare un acquisto.\n\nTieni presente che:\nPuoi configurare un solo volto alla volta. Per aggiungere un altro volto devi eliminare quello attuale.\n\nSe guardi direttamente il telefono, potresti sbloccarlo anche senza volerlo.\n\nIl tuo telefono può essere sbloccato da un\'altra persona se viene rivolto verso il tuo viso.\n\nIl tuo telefono può essere sbloccato da qualcuno che ti assomiglia molto, ad esempio un gemello o una gemella." + "Usa il tuo volto per sbloccare il telefono o per l\'autenticazione nelle app, ad esempio per accedere o approvare un acquisto.\n\nTieni presente che:\nPuoi configurare un solo volto alla volta. Per aggiungere un altro volto devi eliminare quello attuale.\n\nSe guardi direttamente il telefono, potresti sbloccarlo anche senza volerlo.\n\nIl tuo telefono può essere sbloccato da un\'altra persona se viene rivolto verso il tuo viso, anche se hai gli occhi chiusi.\n\nIl tuo telefono può essere sbloccato da qualcuno che ti assomiglia molto, ad esempio un gemello o una gemella." "Eliminare il modello del volto?" "Il modello del volto verrà eliminato definitivamente e in sicurezza.\n\nDopo l\'eliminazione dovrai usare il PIN, la sequenza o la password per sbloccare il telefono o eseguire l\'autenticazione nelle app." "Il modello del volto verrà eliminato definitivamente e in sicurezza.\n\nDopo l\'eliminazione dovrai usare il PIN, la sequenza o la password per sbloccare il telefono." @@ -3925,7 +3925,7 @@ "Nascondi le notifiche silenziose nella barra di stato" "Luce lampeggiante" "Privacy" - "Ignorare la schermata di blocco" + "Ignora schermata di blocco" "Dopo lo sblocco, vai direttamente all\'ultima schermata usata" "Schermata di blocco, Schermata blocco, Salta, Ignora" "Con profilo di lavoro bloccato" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index a9b1da0783d..11bb16e2f39 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -3928,7 +3928,7 @@ "표시등 깜박임" "개인 정보 보호" "잠금 화면 건너뛰기" - "잠금 해제 후 최근 사용한 화면으로 바로 이동" + "잠금 해제 후 최근 사용한 화면으로 바로 이동합니다." "잠금 화면, 잠금화면, 건너뛰기, 우회" "직장 프로필이 잠긴 경우" "잠금 화면에 표시할 알림" diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index 621e5d1fc29..8436fcb3356 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -348,7 +348,7 @@ "Жүзүнөн таанып ачуу" "Жумуш профили үчүн Жүзүнөн таанып ачуу функциясы" "Жүзүнөн таанып ачуу функциясын кантип койсо болот" - "Жүзүнөн таанып ачууну жөндөө" + "Жүзүнөн таанып ачууну тууралоо" "Жүзүңүз менен аныктыгыңызды текшертиңиз" @@ -407,7 +407,7 @@ "Жүзүнөн таанып ачуу функциясын кайрадан жөндөңүз" "Жүзүнөн таанып ачуу функциясын кайрадан жөндөңүз" "Коопсуздукту жана иштин майнаптуулугун жакшыртыңыз" - "Жүзүнөн таанып ачууну жөндөө" + "Жүзүнөн таанып ачууну тууралоо" "Жүзүнөн таанып ачуу функциясын кайра коюу үчүн жүзүңүздүн учурдагы үлгүсүн өчүрүңүз.\n\nЖүзүңүздүн үлгүсү биротоло өчүрүлөт.\n\nӨчүрүлгөндөн кийин телефонуңуздун кулпусун ачуу же колдонмолордо аутентификациядан өтүү үчүн PIN кодуңуз, графикалык ачкычыңыз же сырсөзүңүз керек болот." "Жүзүнөн таанып ачуу функциясын кайра коюу үчүн жүзүңүздүн учурдагы үлгүсүн өчүрүңүз.\n\nЖүзүңүздүн үлгүсү биротоло өчүрүлөт.\n\nӨчүрүлгөндөн кийин телефонуңуздун кулпусун ачуу же колдонмолордо аутентификациядан өтүү үчүн манжаңыздын изи, PIN код, графикалык ачкыч же сырсөз керек болот." "Жүзүнөн таанып ачуу:" @@ -417,7 +417,7 @@ "Ар дайым ырастоо талап кылынсын" "Жүзүнөн таанып ачуу функциясы колдонулганда, ар дайым ырастоо талап кылынат" "Жүздүн үлгүсүн өчүрүү" - "Жүзүнөн таанып ачууну жөндөө" + "Жүзүнөн таанып ачууну тууралоо" "Жүзүңүз менен телефонуңуздун кулпусун ачыңыз же өзүңүздү ырастаңыз (мисалы, колдонмолорго кирүү же кандайдыр бир нерсени сатып алуу үчүн).\n\nКөңүл буруңуз:\nБир убакта бир гана жүз кошо аласыз. Башка жүз кошуу үчүн учурдагыны өчүрүшүңүз керек.\n\nЭкранды карап койсоңуз эле, түзмөгүңүздүн кулпусу ачылып калышы мүмкүн.\n\nОшондой эле кимдир бирөө телефонуңузду жүзүңүзгө алып келип ачышы мүмкүн.\n\nТелефонуңуздун кулпусун сизге аябай окшош адам (мисалы, эгизиңиз) ачып алышы мүмкүн." "Жүзүңүз менен телефонуңуздун кулпусун ачыңыз же өзүңүздү ырастаңыз (мисалы, колдонмолорго кирүү же кандайдыр бир нерсени сатып алуу үчүн).\n\nКөңүл буруңуз:\nБир убакта бир гана жүз кошо аласыз. Башка жүз кошуу үчүн учурдагыны өчүрүшүңүз керек.\n\nЭкранды карап койсоңуз эле, түзмөгүңүздүн кулпусу ачылып калышы мүмкүн.\n\nОшондой эле кимдир бирөө көзүңүз жумулуп турганда да, телефонуңузду жүзүңүзгө жакын алып келип ачып алышы ыктымал.\n\nТелефонуңуздун кулпусун сизге аябай окшош адам (мисалы, эгизиңиз) ачып алышы мүмкүн." "Жүздүн үлгүсүн өчүрөсүзбү?" @@ -5552,7 +5552,7 @@ "Кубат баскычы жана Шашылыш билдирүү менюсу:\nКубат менен Үндү катуулатуу баскычтарын чогуу басыңыз." "Шыңгыратуунун алдын алуу:\nЫкчам баскыч үндү катуулатуу менюсунда жеткиликтүү." "Коё бербей басып туруунун узактыгы" - "Сезгичтигин тууралоо үчүн кубат баскычын канча убакытка чейин коё бербей басып туруу керектигин тандаңыз" + "Сезгичтигин тууралоо үчүн кубат баскычын канчага чейин коё бербей басып туруу керектигин тандаңыз" "Кыска" "Узун" "Капчыкты көрсөтүү" diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml index bb9d8634652..648bac46171 100644 --- a/res/values-mk/strings.xml +++ b/res/values-mk/strings.xml @@ -416,7 +416,7 @@ "За да го отклучите телефонот, очите мора да ви бидат отворени" "Секогаш барај потврда" "При користење „Отклучување со лик“ во апликации, секогаш барај потврда" - "Избриши го моделот на лице" + "Избриши го моделот на лик" "Поставете „Отклучување со лик“" "Користете го вашето лице за да го отклучувате телефонот или за проверка во апликации, како на пр., кога се најавувате или одобрувате купување.\n\nИмајте предвид:\nможе да имате поставено само еден лик. За да додадете друг лик, избришете го моменталниот.\n\nПоглед кон телефонот може да го отклучи и кога немате таква намера.\n\nНекој друг може да го отклучи вашиот телефон ако го подигне до вашиот лик.\n\nТелефонот може да го отклучи некој што многу наликува на вас, на пример, идентичен близнак." "Користете го вашето лице за да го отклучувате телефонот или за проверка во апликации, како на пр., кога се најавувате или одобрувате купување.\n\nИмајте предвид:\nможе да имате поставено само еден лик. За да додадете друг лик, избришете го моменталниот.\n\nПоглед кон телефонот може да го отклучи и кога немате таква намера.\n\nНекој друг може да го отклучи вашиот телефон ако го подигне до вашиот лик, дури и ако очите ви се затворени.\n\nТелефонот може да го отклучи некој што многу наликува на вас, на пример, идентичен близнак." @@ -1977,7 +1977,7 @@ "Ја заборавивте лозинката?" "Ја заборавивте шемата?" "Го заборавивте PIN-кодот?" - "Користете ја шемата на уредот за да продолжите" + "Внесете ја шемата на уредот за да продолжите" "Внесете го PIN-кодот на уредот за да продолжите" "Внесете ја лозинката на уредот за да продолжите" "Користете ја шемата на работниот профил за да продолжите" diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index b8a1d7e5156..69e1daf039f 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -1955,7 +1955,7 @@ "तुमचा पासवर्ड पुन्‍हा टाका" "तुमचा कार्य पासवर्ड पुन्हा एंटर करा" "तुमच्या ऑफिसचा पासवर्ड एंटर करा" - "आपल्या नमुन्याची पुष्टी करा" + "तुमचा पॅटर्न कंफर्म करा" "तुमच्या ऑफिसचा पॅटर्न एंटर करा" "तुमचा पिन पुन्हा टाका" "तुमचा कार्य पिन पुन्हा एंटर करा" diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index 4e39d4fffa7..67e428680ee 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -1568,7 +1568,7 @@ "စက်မှတ်ပုံတင်နံပါတ်" "ဖွင့်ထားသောအချိန်" "ပြန်ပွင့်မည်အချိန်" - "စက်တွင်း သိုလှောင်ထားမှု" + "စက်တွင်းသိုလှောင်ခန်း" "USBဖြင့် သိမ်းဆည်းခြင်း" "SD ကတ်" "နေရာလွတ်" @@ -1655,9 +1655,9 @@ "သင့် ^1 ကိုတပ်ဆင်မည်" "ရွှေ့လျားနိုင်သည့် သိုလှောင်မှုအဖြစ် သုံးမည်" "စက်ပစ္စည်းများအကြား ပုံများနှင့် အခြားမီဒီယာများရွှေ့လျားရန်အတွက်။" - "အတွင်းသိုလှောင်မှုအဖြစ် အသုံးပြုမည်" + "စက်တွင်းသိုလှောင်ခန်းအဖြစ် သုံးရန်" "အပ်ဖ်များနှင့် ပုံများ အပါအဝင် ဤစက်ပစ္စည်းပေါ်တွင်သာ သိုလှောင်ရန်အတွက် ဖြစ်သည်။ ပုံစံချရန်လိုအပ်ပြီး ၎င်းသည်အခြားစက်ပစ္စည်းများနှင့် အလုပ်လုပ်ခြင်းမှ ကာကွယ်မည်ဖြစ်သည်။" - "အတွင်းသိုလှောင်မှုအဖြစ် ပုံစံချမည်" + "စက်တွင်းသိုလှောင်ခန်းအဖြစ်" "လုံခြုံစေရန်အတွက် ၎င်းတွင် ^1 ကိုပုံစံချထားရန် လိုအပ်ပါသည်။\n\nပုံစီချပြီးနောက်၊ ^1 သည်ဤစက်ပစ္စည်းတွင်သာ အလုပ်လုပ်ပါမည်။ \n\n""ပုံစံချခြင်းဖြင့်^1တွင်လက်ရှိသိုလှောင်ထားသည့် ဒေတာများအားလုံးကို ဖျက်ပစ်မည်ဖြစ်သည်။"" ဒေတာများ ဆုံးရှုံးခြင်းမှ ကာကွယ်ရန်၊ အရံကူးယူထားရန် စဉ်းစားပါ။" "သယ်နိုင်သောသိုလှောင်မှုပုံစံချပါ" "^1 အား ပုံစံချရန် လိုအပ်သည်။ \n\n"" ပုံစံချပါက ^1 တွင် လတ်တလော သိမ်းထားသည်များအားလုံးအား ပျက်သွားမည်။ "" ဒေတာများပျောက်ပျက်သွားခြင်းမှ ကာကွယ်လိုပါ၊ အရံသိမ်းဆည်းခြင်းပြုရန် စဉ်းစားပါ။" @@ -1665,7 +1665,7 @@ "^1ပုံစံချနေသည်…" "ဖော်မက်လုပ်နေစဉ် ^1 ကို မဖယ်ရှားပါနှင့်။" "ဒေတာကို သိုလှောင်မှုအသစ်သို့ ရွှေ့မည်" - "သင့်ပုံများ၊ ဖိုင်များနှင့် အချို့ အက်ပ်များကို ဤ^1 အသစ်ပေါ်သို့ ရွှေ့နိုင်သည်။ \n\nရွှေ့ခြင်းသည်^2 ခန့်ကြာမည်ဖြစ်ပြီး အတွင်းသိုလှောင်မှုတွင် ^3 ခန့်နေရာလွတ်သွားပါမည်။ ၎င်းပြုလုပ်နေစဉ် အချို့သော အက်ပ်များ အလုပ်လုပ်မည်မဟုတ်ပါ။" + "သင့်ပုံများ၊ ဖိုင်များနှင့် အချို့အက်ပ်များကို ဤ ^1 အသစ်ပေါ်သို့ ရွှေ့နိုင်သည်။ \n\nရွှေ့ချိန် ^2 ခန့်ကြာပြီး စက်တွင်းသိုလှောင်ခန်းတွင် ^3 နေရာလွတ်သွားပါမည်။ ၎င်းပြုလုပ်နေစဉ် အချို့သော အက်ပ်များ အလုပ်လုပ်မည်မဟုတ်ပါ။" "ယခုရွှေ့မည်" "နောက်မှ ရွှေ့မည်" "ဒေတာများယခု ရွှေ့မည်" @@ -1781,7 +1781,7 @@ "ဒေတာအားလုံးဖျက်ရန် (စက်ရုံထုတ်ဆက်တင် သတ်မှတ်ရန်)" "ဒေတာအားလုံးဖျက်ခြင်း (စက်ရုံထုတ်ဆက်တင် သတ်မှတ်ရန်)" "ဤသို့ပြုလုပ်ခြင်းက သင့်တက်ဘလက်၏ ""စက်အတွင်းသိုလှောင်ခန်း"" အပါအဝင် အောက်ပါဒေတာအားလုံးကို ဖျက်ပါမည်-\n\n"
  • "သင်၏ Google အကောင့်"
    • \n
  • "စနစ်နှင့် အက်ပ်ဒေတာ၊ ဆက်တင်များ၊"
    • \n
  • "ဒေါင်းလုဒ်လုပ်ထားသည့်အက်ပ်များ"
    •  - "ဤသို့ပြုလုပ်ခြင်းက သင့်ဖုန်း၏ ""စက်အတွင်းသိုလှောင်ခန်း"" အပါအဝင် အောက်ပါဒေတာအားလုံးကို ဖျက်ပါမည်- \n\n"
  • "သင်၏ Google အကောင့်"
    • \n
  • "စနစ်နှင့် အက်ပ်ဒေတာ၊ ဆက်တင်များ၊"
    • \n
  • "ဒေါင်းလုဒ်လုပ်ထားသည့်အက်ပ်များ"
    •  + "ဤသို့ပြုလုပ်ခြင်းဖြင့် အောက်ပါတို့ အပါအဝင် သင့်ဖုန်း၏ ""စက်တွင်းသိုလှောင်ခန်း"" ရှိဒေတာအားလုံးကို ဖျက်ပါမည်- \n\n"
  • "သင်၏ Google Account"
    • \n
  • "စနစ်နှင့် အက်ပ်ဒေတာ၊ ဆက်တင်များ၊"
    • \n
  • "ဒေါင်းလုဒ်လုပ်ထားသည့်အက်ပ်များ"
    •  \n\n"သင်သည် လက်ရှိတွင် အောက်ပါအကောင့်များကို ဝင်ရောက်ထားပါသည်\n" \n\n"ဤစက်ပစ္စည်းပေါ်တွင် အခြားအသုံးပြုသူများလည်း ရှိသည်။\n"
  • "သီချင်း"
    • \n
  • "ဓာတ်ပုံများ"
    • \n
  • "အသုံးပြုသူ၏အခြားဒေတာ"
    •  @@ -2113,7 +2113,7 @@ "ဤအသုံးပြုသူအတွက် ထည့်သွင်းမထားပါ" "ထည့်သွင်းထားသည်" "အက်ပ် မရှိပါ။" - "စက်တွင်း သိုလှောင်ထားမှု" + "သိုလှောင်ခန်း" "အရွယ်အစားကို ပြန်လည်တွက်ချက်နေသည်" "အက်ပ်ဒေတာ ဖျက်မလား။" "ဖိုင်နှင့် ဆက်တင်များအပါအဝင် ဤအက်ပ်၏ ဒေတာအားလုံးကို စက်မှ အပြီးဖျက်လိုက်ပါမည်" @@ -4379,7 +4379,7 @@ "ထည့်ရန်" "%s တွင် ဖွင့်သည်" "%2$sထဲတွင် %1$sသုံးထားသည်" - "စက်အတွင်းသိမ်းဆည်းရန်နေရာ" + "စက်တွင်းသိုလှောင်ခန်း" "ပြင်ပသိုလှောင်ခန်း" "%2$s မှစ၍ %1$s အသုံးပြုခဲ့သည်။" "အသုံးပြုပြီး သိုလှောင်ရုံ" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 12465481b6b..cb9c32f737d 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -3005,7 +3005,7 @@ "6 uur" "12 uur" "1 dag" - "Systeem tonen" + "Systeem-apps tonen" "Systeem verbergen" "Percentages tonen" "USS gebruiken" diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index 24efed9c859..b5dbd34942d 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -1719,7 +1719,7 @@ "ବ୍ୟାଟେରୀ ସ୍ଥିତି" "ବ୍ୟାଟେରୀ ସ୍ତର" "APNs" - "ଆକ୍ସେସ୍‌ ପଏଣ୍ଟକୁ ଏଡିଟ୍ କରନ୍ତୁ" + "ଆକ୍ସେସ ପଏଣ୍ଟକୁ ଏଡିଟ କରନ୍ତୁ" "ସେଟ୍ ହୋଇନାହିଁ" "ସେଟ୍ କରାଯାଇନାହିଁ" "ନାମ" @@ -2257,8 +2257,8 @@ "ଭାଷା:" "ଏକ ଶବ୍ଦ ଟାଇପ୍‌ କରନ୍ତୁ" "ବିକଳ୍ପ ସର୍ଟକଟ୍‌" - "ଶବ୍ବ ସମ୍ପାଦନ କରନ୍ତୁ" - "ସମ୍ପାଦନ" + "ଶବ୍ବ ଏଡିଟ କରନ୍ତୁ" + "ଏଡିଟ" "ଡିଲିଟ୍‌ କରନ୍ତୁ" "ଉପଯୋଗକର୍ତ୍ତା ଶବ୍ଦକୋଷରେ ଆପଣ କୌଣସି ଶବ୍ଦ ଯୋଗ କରିନାହାଁନ୍ତି। ଶବ୍ଦ ଯୋଗ କରିବା ପାଇଁ \"ଯୋଗ(+)\" ବଟନ୍‌ରେ ଟାପ୍‌ କରନ୍ତୁ।" "ସମସ୍ତ ଭାଷାଗୁଡିକ ପାଇଁ" @@ -3307,7 +3307,7 @@ "ସେଭ୍‌ କରନ୍ତୁ" "ସଂଯୋଗ କରନ୍ତୁ" "ପରିବର୍ତ୍ତନ" - "VPN ପ୍ରୋଫାଇଲ୍‌ ଏଡିଟ୍ କରନ୍ତୁ" + "VPN ପ୍ରୋଫାଇଲ ଏଡିଟ କରନ୍ତୁ" "ଭୁଲିଯାଆନ୍ତୁ" "%s ସହ ସଂଯୋଗ କରନ୍ତୁ" "ଏହି VPNକୁ ବିଚ୍ଛିନ୍ନ କରିବେ?" @@ -3325,7 +3325,7 @@ "ସର୍ବଦା-ଅନ୍‌ VPNକୁ ଏହି ଆପ୍‌ ସପୋର୍ଟ କରୁନାହିଁ" "VPN" "VPN ପ୍ରୋଫାଇଲ୍‌ ଯୋଡ଼ନ୍ତୁ" - "ପ୍ରୋଫାଇଲ୍ ଏଡିଟ୍‌ କରନ୍ତୁ" + "ପ୍ରୋଫାଇଲ ଏଡିଟ କରନ୍ତୁ" "ପ୍ରୋଫାଇଲ ଡିଲିଟ କରନ୍ତୁ" "ସର୍ବଦା-ଅନ୍‌ ଥିବା VPN" "କୌଣସି VPN ଯୋଗ କରାଯାଇନାହିଁ" @@ -3752,7 +3752,7 @@ "ସିଡୁଲ୍" "ସିଡୁଲ୍ ଡିଲିଟ୍ କରନ୍ତୁ" "ଡିଲିଟ୍ କରନ୍ତୁ" - "ଏଡିଟ୍ କରନ୍ତୁ" + "ଏଡିଟ" "ସିଡୁଲ୍" "ସିଡୁଲ୍" "ସିଡୁଲ୍" @@ -4616,7 +4616,7 @@ "ମିଡିଆ ମ୍ୟାନେଜମେଣ୍ଟ ଆପଗୁଡ଼ିକ" "ମିଡିଆକୁ ପରିଚାଳନା କରିବାକୁ ଆପକୁ ଅନୁମତି ଦିଅନ୍ତୁ" "ଯଦି ଅନୁମତି ଦିଆଯାଏ, ତେବେ ଏହି ଆପ୍ ଆପଣଙ୍କୁ ନପଚାରି ଅନ୍ୟ ଆପଗୁଡ଼ିକ ସହ ତିଆରି କରାଯାଇଥିବା ମିଡିଆ ଫାଇଲଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କିମ୍ବା ଡିଲିଟ୍ କରିପାରିବ। ଫାଇଲ୍ ଏବଂ ମିଡିଆକୁ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଆପର ଅନୁମତି ରହିବା ଆବଶ୍ୟକ।" - "ମିଡିଆ, ଫାଇଲ୍, ପରିଚାଳନା, ପରିଚାଳକ, ପରିଚାଳନା କରନ୍ତୁ, ଏଡିଟ୍ କରନ୍ତୁ, ଏଡିଟର୍, ଆପ୍, ଆପ୍ଲିକେସନ୍, ପ୍ରୋଗ୍ରାମ୍" + "ମିଡିଆ, ଫାଇଲ, ପରିଚାଳନା, ପରିଚାଳକ, ପରିଚାଳନା କରନ୍ତୁ, ଏଡିଟ କରନ୍ତୁ, ଏଡିଟର, ଆପ, ଆପ୍ଲିକେସନ, ପ୍ରୋଗ୍ରାମ" "vr ଭର୍ଚୁଆଲ୍‌ ରିଅଲିଟୀ ଲିସ୍‌ନର୍‌ ଷ୍ଟେରିଓ ସାହାଯ୍ୟକାରୀ ସେବା" "ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକ ଉପରେ ଦେଖାନ୍ତୁ" "%2$d ଟି ଆପ୍‌ରୁ %1$d ଅନ୍ୟ ଆପ୍‌ଗୁଡ଼ିକରେ ଡିସପ୍ଲେ କରିବାକୁ ଅନୁମୋଦିତ" diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index 5defa5cfab8..efca0ab21f0 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -1053,8 +1053,8 @@ "ਵਾਈ-ਫਾਈ ਹੌਟਸਪੌਟ ਲਈ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਬੈਂਡ ਚੁਣੋ:" "IP ਸੈਟਿੰਗਾਂ" "ਪਰਦੇਦਾਰੀ" - "ਗਾਹਕੀ" - "ਗਾਹਕੀ ਦੇਖੋ ਜਾਂ ਬਦਲੋ" + "ਸਬਸਕ੍ਰਿਪਸ਼ਨ" + "ਸਬਸਕ੍ਰਿਪਸ਼ਨ ਦੇਖੋ ਜਾਂ ਬਦਲੋ" "ਬੇਤਰਤੀਬਾ MAC" "ਕੋਈ ਡੀਵਾਈਸ ਸ਼ਾਮਲ ਕਰੋ" "ਡੀਵਾਈਸ ਨੂੰ “%1$s” ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨ ਲਈ QR ਕੋਡ ਨੂੰ ਹੇਠਾਂ ਵਿਚਾਲੇ ਰੱਖੋ" @@ -1144,12 +1144,12 @@ %d ਨੈੱਟਵਰਕ - %d ਗਾਹਕੀ - %d ਗਾਹਕੀਆਂ + %d ਸਬਸਕ੍ਰਿਪਸ਼ਨ + %d ਸਬਸਕ੍ਰਿਪਸ਼ਨਾਂ - %d ਨੈੱਟਵਰਕ ਅਤੇ ਗਾਹਕੀ - %d ਨੈੱਟਵਰਕ ਅਤੇ ਗਾਹਕੀਆਂ + %d ਨੈੱਟਵਰਕ ਅਤੇ ਸਬਸਕ੍ਰਿਪਸ਼ਨ + %d ਨੈੱਟਵਰਕ ਅਤੇ ਸਬਸਕ੍ਰਿਪਸ਼ਨਾਂ "ਵਿਕਸਿਤ ਵਾਈ‑ਫਾਈ" "SSID" @@ -5377,9 +5377,9 @@ "ਸਿਸਟਮ ਵੱਲੋਂ ਚੁਣਿਆ" "ਨੈੱਟਵਰਕ" "ਨੈੱਟਵਰਕ" - "CDMA ਗਾਹਕੀ" + "CDMA ਸਬਸਕ੍ਰਿਪਸ਼ਨ" "RUIM/SIM ਅਤੇ NV ਵਿਚਾਲੇ ਬਦਲੋ" - "ਗਾਹਕੀ" + "ਸਬਸਕ੍ਰਿਪਸ਼ਨ" "ਸਵੈਚਲਿਤ ਰਜਿਸਟਰੇਸ਼ਨ…" "ਕੀ ਡਾਟਾ ਰੋਮਿੰਗ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?" "ਕੀਮਤਾਂ ਜਾਣਨ ਲਈ ਆਪਣੇ ਨੈੱਟਵਰਕ ਪ੍ਰਦਾਨਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 34a3e5c0442..7c4675bfafd 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -4811,7 +4811,7 @@ "Вы вошли как %1$s" "По умолчанию: %1$s" "Резервное копирование отключено" - "Обновлено до Android %1$s" + "Система обновлена до Android %1$s" "Доступно обновление" "Заблокировано вашим администратором" "Невозможно изменить громкость" diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index 433d4154e72..b47f435ea8b 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -416,7 +416,7 @@ "ఫోన్‌ను అన్‌లాక్ చేయడానికి, మీ కళ్లు తప్పనిసరిగా తెరిచి ఉంచాలి" "ఎల్లప్పుడూ నిర్ధారణ కోసం అడగాలి" "యాప్‌లలో ఫేస్ అన్‌లాక్‌ను ఉపయోగించేటప్పుడు, నిర్ధారణ దశ అవసరమవుతుంది" - "ఫేస్ మోడల్‌ను తొలగించు" + "ఫేస్ మోడల్‌ను తొలగించండి" "ఫేస్ అన్‌లాక్‌ను సెటప్ చేయండి" "మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి గానీ లేదా యాప్‌లకు సైన్ ఇన్ చేసినప్పుడు లేదా కొనుగోలును ఆమోదించడం లాంటి ప్రామాణీకరణ కోసం గానీ మీ ముఖాన్ని ఉపయోగించండి.\n\nఅలాగే, దీనిని గుర్తుంచుకోండి:\nమీరు ఒకేసారి ఒక ముఖాన్ని మాత్రమే సెట్ చేయవచ్చు. మరొక ముఖాన్ని జోడించడానికి, ప్రస్తుతం ఉన్న దానిని తొలగించండి.\n\nమీరు అనుకోకుండా ఫోన్ వైపు చూసినా కూడా అన్‌లాక్ అయ్యే అవకాశం ఉంటుంది.\n\nమీ ముఖాన్ని స్క్రీన్ వైపు చూపితే, ఇతరులు కూడా మీ ఫోన్‌ను అన్‌లాక్ చేయగలుగుతారు.\n\nమీలాంటి రూపం ఉన్న వ్యక్తులు, ఉదాహరణకు, మీ కవల తోబుట్టువు మీ ఫోన్‌ను అన్‌లాక్ చేయగలిగే అవకాశం ఉంది." "మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి గానీ లేదా యాప్‌లకు సైన్ ఇన్ చేసినప్పుడు లేదా కొనుగోలును ఆమోదించడం లాంటి ప్రామాణీకరణ కోసం గానీ మీ ముఖాన్ని ఉపయోగించండి.\n\nఅలాగే, దీనిని గుర్తుంచుకోండి:\nమీరు ఒకేసారి ఒక ముఖాన్ని మాత్రమే సెట్ చేయవచ్చు. మరొక ముఖాన్ని జోడించడానికి, ప్రస్తుతం ఉన్న దానిని తొలగించండి.\n\nమీరు అనుకోకుండా ఫోన్ వైపు చూసినా కూడా అన్‌లాక్ అయ్యే అవకాశం ఉంటుంది.\n\nమీ కళ్లు మూసి ఉన్నా కూడా, మీ ముఖాన్ని స్క్రీన్ వైపు చూపితే, ఇతరులు కూడా మీ ఫోన్‌ను అన్‌లాక్ చేయగలుగుతారు.\n\nమీలాంటి రూపం ఉన్న వ్యక్తులు, ఉదాహరణకు, మీ కవల తోబుట్టువు మీ ఫోన్‌ను అన్‌లాక్ చేయగలిగే అవకాశం ఉంది." diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index a4125812a6c..afe6a3bc522 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -423,7 +423,7 @@ "Завжди просити підтвердження" "Просити підтвердження під час використання фейсконтролю в додатках" "Видалити модель обличчя" - "Налаштування фейсконтролю" + "Налаштувати фейсконтроль" "За допомогою фейсконтролю ви можете розблоковувати телефон або проходити автентифікацію в додатках, наприклад щоб увійти в обліковий запис або схвалити покупку.\n\nЗверніть увагу:\nза раз можна налаштувати фейсконтроль лише для одного обличчя. Щоб додати інше обличчя, видаліть поточне.\n\nПоглянувши на телефон, ви можете випадково розблокувати його в недоречний момент.\n\nБудь-хто може розблокувати телефон, якщо піднесе його до вашого обличчя.\n\nТелефон може розблокувати людина, схожа на вас, зокрема ваш близнюк." "За допомогою фейсконтролю ви можете розблоковувати телефон або проходити автентифікацію в додатках, наприклад щоб увійти в обліковий запис або схвалити покупку.\n\nЗверніть увагу:\nза раз можна налаштувати фейсконтроль лише для одного обличчя. Щоб додати інше обличчя, видаліть поточне.\n\nПоглянувши на телефон, ви можете випадково розблокувати його в недоречний момент.\n\nБудь-хто може розблокувати телефон, якщо піднесе його до вашого обличчя, навіть коли у вас заплющені очі.\n\nТелефон може розблокувати людина, схожа на вас, зокрема ваш близнюк." "Видалити модель обличчя?" @@ -437,10 +437,10 @@ "Додати відбиток пальця" "блокування екрана" - %1$d відбиток пальця додано - %1$d відбитки пальців додано - %1$d відбитків пальців додано - %1$d відбитка пальця додано + Додано %1$d відбиток пальця + Додано %1$d відбитки пальців + Додано %1$d відбитків пальців + Додано %1$d відбитка пальця "Налаштуйте \"Відбиток пальця\"" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index b61349dd6ef..29b6b054fbc 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -1977,7 +1977,7 @@ "忘記密碼了嗎？" "忘記解鎖圖案了嗎？" "忘記 PIN 碼了嗎？" - "請用裝置解鎖圖案解鎖以繼續" + "請用裝置解鎖圖案解鎖" "輸入裝置 PIN 碼即可繼續" "請輸入你的裝置密碼以繼續作業" "請用工作資料夾的解鎖圖案解鎖以繼續" From d4f9588a3dc92178b72e8d9f3a636bf356d6fb82 Mon Sep 17 00:00:00 2001 From: Zaiyue Xue Date: Tue, 19 Jul 2022 10:40:45 +0800 Subject: [PATCH 10/10] Refactor Battery Chart View State Controll When users click the battery chart, the orignal behavior is that the view changes the state by itself. This cl refactors the bahavior to that the view callbacks to the controller, and the controller changes the view's state. In this way, the controller is the only source of truth of the state. This meets the controller-view model. Test: manual Bug: 239491373, 236101166 Change-Id: I754ded2dba20319f1571374dfdbef27f2420ed78 --- .../BatteryChartPreferenceControllerV2.java | 1 + .../batteryusage/BatteryChartViewV2.java | 21 +++--- .../batteryusage/BatteryChartViewV2Test.java | 65 +++++++++---------- 3 files changed, 42 insertions(+), 45 deletions(-) diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerV2.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerV2.java index dc80b84b06e..d5491018ba9 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerV2.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerV2.java @@ -347,6 +347,7 @@ public class BatteryChartPreferenceControllerV2 extends AbstractPreferenceContro trapezoidIndex, mBatteryIndexedMap.size(), isForce)); mTrapezoidIndex = trapezoidIndex; + mBatteryChartView.setSelectedIndex(mTrapezoidIndex); mHandler.post(() -> { final long start = System.currentTimeMillis(); removeAndCacheAllPrefs(); diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartViewV2.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartViewV2.java index 5db5d52c6d9..15a3ca6f69f 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartViewV2.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartViewV2.java @@ -110,9 +110,11 @@ public class BatteryChartViewV2 extends AppCompatImageView implements View.OnCli @VisibleForTesting Paint mTrapezoidCurvePaint = null; - private TrapezoidSlot[] mTrapezoidSlots; + @VisibleForTesting + TrapezoidSlot[] mTrapezoidSlots; // Records the location to calculate selected index. - private float mTouchUpEventX = Float.MIN_VALUE; + @VisibleForTesting + float mTouchUpEventX = Float.MIN_VALUE; private BatteryChartViewV2.OnSelectListener mOnSelectListener; public BatteryChartViewV2(Context context) { @@ -161,10 +163,6 @@ public class BatteryChartViewV2 extends AppCompatImageView implements View.OnCli if (mSelectedIndex != index) { mSelectedIndex = index; invalidate(); - // Callbacks to the listener if we have. - if (mOnSelectListener != null) { - mOnSelectListener.onSelect(mSelectedIndex); - } } } @@ -301,11 +299,9 @@ public class BatteryChartViewV2 extends AppCompatImageView implements View.OnCli || !isValidToDraw(trapezoidIndex)) { return; } - // Selects all if users click the same trapezoid item two times. - if (trapezoidIndex == mSelectedIndex) { - setSelectedIndex(SELECTED_INDEX_ALL); - } else { - setSelectedIndex(trapezoidIndex); + if (mOnSelectListener != null) { + mOnSelectListener.onSelect( + trapezoidIndex == mSelectedIndex ? SELECTED_INDEX_ALL : trapezoidIndex); } view.performHapticFeedback(HapticFeedbackConstants.CONTEXT_CLICK); } @@ -614,7 +610,8 @@ public class BatteryChartViewV2 extends AppCompatImageView implements View.OnCli } // A container class for each trapezoid left and right location. - private static final class TrapezoidSlot { + @VisibleForTesting + static final class TrapezoidSlot { public float mLeft; public float mRight; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartViewV2Test.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartViewV2Test.java index 2879cf6989f..34ba2ebeeb2 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartViewV2Test.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartViewV2Test.java @@ -26,6 +26,7 @@ import static org.mockito.Mockito.when; import android.accessibilityservice.AccessibilityServiceInfo; import android.content.Context; import android.os.LocaleList; +import android.view.View; import android.view.accessibility.AccessibilityManager; import com.android.settings.fuelgauge.PowerUsageFeatureProvider; @@ -55,6 +56,8 @@ public final class BatteryChartViewV2Test { private AccessibilityServiceInfo mMockAccessibilityServiceInfo; @Mock private AccessibilityManager mMockAccessibilityManager; + @Mock + private View mMockView; @Before public void setUp() { @@ -74,13 +77,13 @@ public final class BatteryChartViewV2Test { } @Test - public void testIsAccessibilityEnabled_disable_returnFalse() { + public void isAccessibilityEnabled_disable_returnFalse() { doReturn(false).when(mMockAccessibilityManager).isEnabled(); assertThat(BatteryChartViewV2.isAccessibilityEnabled(mContext)).isFalse(); } @Test - public void testIsAccessibilityEnabled_emptyInfo_returnFalse() { + public void isAccessibilityEnabled_emptyInfo_returnFalse() { doReturn(true).when(mMockAccessibilityManager).isEnabled(); doReturn(new ArrayList()) .when(mMockAccessibilityManager) @@ -90,45 +93,41 @@ public final class BatteryChartViewV2Test { } @Test - public void testIsAccessibilityEnabled_validServiceId_returnTrue() { + public void isAccessibilityEnabled_validServiceId_returnTrue() { doReturn(true).when(mMockAccessibilityManager).isEnabled(); assertThat(BatteryChartViewV2.isAccessibilityEnabled(mContext)).isTrue(); } @Test - public void testSetSelectedIndex_invokesCallback() { + public void onClick_invokesCallback() { + mBatteryChartView.setLevels(new int[] {90, 80, 70, 60}); + for (int i = 0; i < mBatteryChartView.mTrapezoidSlots.length; i++) { + mBatteryChartView.mTrapezoidSlots[i] = new BatteryChartViewV2.TrapezoidSlot(); + mBatteryChartView.mTrapezoidSlots[i].mLeft = i; + mBatteryChartView.mTrapezoidSlots[i].mRight = i + 0.5f; + } + mBatteryChartView.mSelectedIndex = 2; final int[] selectedIndex = new int[1]; - final int expectedIndex = 2; - mBatteryChartView.mSelectedIndex = 1; mBatteryChartView.setOnSelectListener( trapezoidIndex -> { selectedIndex[0] = trapezoidIndex; }); - mBatteryChartView.setSelectedIndex(expectedIndex); + // Verify onClick() a different index 1. + mBatteryChartView.mTouchUpEventX = 1; + selectedIndex[0] = Integer.MIN_VALUE; + mBatteryChartView.onClick(mMockView); + assertThat(selectedIndex[0]).isEqualTo(1); - assertThat(mBatteryChartView.mSelectedIndex) - .isEqualTo(expectedIndex); - assertThat(selectedIndex[0]).isEqualTo(expectedIndex); + // Verify onClick() the same index 2. + mBatteryChartView.mTouchUpEventX = 2; + selectedIndex[0] = Integer.MIN_VALUE; + mBatteryChartView.onClick(mMockView); + assertThat(selectedIndex[0]).isEqualTo(BatteryChartViewV2.SELECTED_INDEX_ALL); } @Test - public void testSetSelectedIndex_sameIndex_notInvokesCallback() { - final int[] selectedIndex = new int[1]; - final int expectedIndex = 1; - mBatteryChartView.mSelectedIndex = expectedIndex; - mBatteryChartView.setOnSelectListener( - trapezoidIndex -> { - selectedIndex[0] = trapezoidIndex; - }); - - mBatteryChartView.setSelectedIndex(expectedIndex); - - assertThat(selectedIndex[0]).isNotEqualTo(expectedIndex); - } - - @Test - public void testClickable_isChartGraphSlotsEnabledIsFalse_notClickable() { + public void clickable_isChartGraphSlotsEnabledIsFalse_notClickable() { mBatteryChartView.setClickableForce(true); when(mPowerUsageFeatureProvider.isChartGraphSlotsEnabled(mContext)) .thenReturn(false); @@ -139,7 +138,7 @@ public final class BatteryChartViewV2Test { } @Test - public void testClickable_accessibilityIsDisabled_clickable() { + public void clickable_accessibilityIsDisabled_clickable() { mBatteryChartView.setClickableForce(true); when(mPowerUsageFeatureProvider.isChartGraphSlotsEnabled(mContext)) .thenReturn(true); @@ -151,7 +150,7 @@ public final class BatteryChartViewV2Test { } @Test - public void testClickable_accessibilityIsEnabledWithoutValidId_clickable() { + public void clickable_accessibilityIsEnabledWithoutValidId_clickable() { mBatteryChartView.setClickableForce(true); when(mPowerUsageFeatureProvider.isChartGraphSlotsEnabled(mContext)) .thenReturn(true); @@ -166,7 +165,7 @@ public final class BatteryChartViewV2Test { } @Test - public void testClickable_accessibilityIsEnabledWithValidId_notClickable() { + public void clickable_accessibilityIsEnabledWithValidId_notClickable() { mBatteryChartView.setClickableForce(true); when(mPowerUsageFeatureProvider.isChartGraphSlotsEnabled(mContext)) .thenReturn(true); @@ -178,7 +177,7 @@ public final class BatteryChartViewV2Test { } @Test - public void testClickable_restoreFromNonClickableState() { + public void clickable_restoreFromNonClickableState() { final int[] levels = new int[13]; for (int index = 0; index < levels.length; index++) { levels[index] = index + 1; @@ -200,14 +199,14 @@ public final class BatteryChartViewV2Test { } @Test - public void testOnAttachedToWindow_addAccessibilityStateChangeListener() { + public void onAttachedToWindow_addAccessibilityStateChangeListener() { mBatteryChartView.onAttachedToWindow(); verify(mMockAccessibilityManager) .addAccessibilityStateChangeListener(mBatteryChartView); } @Test - public void testOnDetachedFromWindow_removeAccessibilityStateChangeListener() { + public void onDetachedFromWindow_removeAccessibilityStateChangeListener() { mBatteryChartView.onAttachedToWindow(); mBatteryChartView.mHandler.postDelayed( mBatteryChartView.mUpdateClickableStateRun, 1000); @@ -222,7 +221,7 @@ public final class BatteryChartViewV2Test { } @Test - public void testOnAccessibilityStateChanged_postUpdateStateRunnable() { + public void onAccessibilityStateChanged_postUpdateStateRunnable() { mBatteryChartView.mHandler = spy(mBatteryChartView.mHandler); mBatteryChartView.onAccessibilityStateChanged(/*enabled=*/ true);