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

Merge "Change Never Option to lock private space after device restart" into main

Browse Source
This commit is contained in:
Joseph Vincent
2024-03-28 22:39:13 +00:00
committed by Android (Google) Code Review
parent 748e0d5db9 d4f5641c55
commit 7e3d30c95f
5 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/unit/src/com/android/settings/privatespace/autolock/AutoLockPreferenceControllerTest.java
View File

@@ -130,9 +130,12 @@ public class AutoLockPreferenceControllerTest {
.isEqualTo("After 5 minutes of inactivity");
}
/** Tests that auto lock preference displays the correct summary for option - Never. */
/**
* Tests that auto lock preference displays the correct summary for option - Only after device
* restarts.
*/
@Test
public void getSummary_whenOptionNever_returnsNever() {
public void getSummary_whenOptionAfterDeviceRestart_returnsOnlyAfterDeviceRestarts() {
mSetFlagsRule.enableFlags(
Flags.FLAG_ALLOW_PRIVATE_PROFILE,
android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE,
@@ -141,7 +144,8 @@ public class AutoLockPreferenceControllerTest {
Settings.Secure.putInt(
mContentResolver,
Settings.Secure.PRIVATE_SPACE_AUTO_LOCK,
Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_NEVER);
assertThat(mAutoLockPreferenceController.getSummary().toString()).isEqualTo("Never");
Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART);
assertThat(mAutoLockPreferenceController.getSummary().toString())
.isEqualTo("Only after device restarts");
}
}

8
tests/unit/src/com/android/settings/privatespace/autolock/AutoLockSettingsFragmentTest.java
View File

@@ -17,8 +17,8 @@
package com.android.settings.privatespace.autolock;
import static android.provider.Settings.Secure.PRIVATE_SPACE_AUTO_LOCK;
import static android.provider.Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART;
import static android.provider.Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_INACTIVITY;
import static android.provider.Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_NEVER;
import static android.provider.Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_ON_DEVICE_LOCK;
import static com.android.settings.privatespace.PrivateSpaceMaintainer.PRIVATE_SPACE_AUTO_LOCK_DEFAULT_VAL;
@@ -128,7 +128,9 @@ public class AutoLockSettingsFragmentTest {
mFragment.onAttach(mContext);
Settings.Secure.putInt(
mContentResolver, PRIVATE_SPACE_AUTO_LOCK, PRIVATE_SPACE_AUTO_LOCK_NEVER);
mContentResolver,
PRIVATE_SPACE_AUTO_LOCK,
PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART);
assertThat(mFragment.getDefaultKey()).isEqualTo("2");
Settings.Secure.putInt(
@@ -153,7 +155,7 @@ public class AutoLockSettingsFragmentTest {
mFragment.onAttach(mContext);
mFragment.setDefaultKey("2");
assertThat(Settings.Secure.getInt(mContentResolver, PRIVATE_SPACE_AUTO_LOCK, -1))
.isEqualTo(PRIVATE_SPACE_AUTO_LOCK_NEVER);
.isEqualTo(PRIVATE_SPACE_AUTO_LOCK_AFTER_DEVICE_RESTART);
mFragment.setDefaultKey("1");
assertThat(Settings.Secure.getInt(mContentResolver, PRIVATE_SPACE_AUTO_LOCK, -1))