Add auto lock preference inside private space settings
This includes below changes - Adds perference for Auto Lock settings inside private space settings page. - Feaure is behind flag android.multiuser.support_autolock_for_private_space Screenshots: go/ss/ZCaYGWMDdH8bQNz.png go/ss/AxnD8DviiT5hhkW.png go/ss/9TMYmacyiVhyexB.png go/ss/6SzhkGfTbDYVUVE.png Bug: 312893140 Test: atest AutoLockPreferenceControllerTest, atest AutoLockPreferenceControllerTest Change-Id: I95beb9d71c709002e17307e612c60b2f5087290b
This commit is contained in:
@@ -18,6 +18,8 @@ package com.android.settings.privatespace;
|
||||
|
||||
import static android.os.UserManager.USER_TYPE_PROFILE_PRIVATE;
|
||||
import static android.provider.Settings.Secure.HIDE_PRIVATESPACE_ENTRY_POINT;
|
||||
import static android.provider.Settings.Secure.PRIVATE_SPACE_AUTO_LOCK;
|
||||
import static android.provider.Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_NEVER;
|
||||
import static android.provider.Settings.Secure.USER_SETUP_COMPLETE;
|
||||
|
||||
import android.app.ActivityManager;
|
||||
@@ -46,7 +48,6 @@ import java.util.List;
|
||||
/** A class to help with the creation / deletion of Private Space */
|
||||
public class PrivateSpaceMaintainer {
|
||||
private static final String TAG = "PrivateSpaceMaintainer";
|
||||
|
||||
@GuardedBy("this")
|
||||
private static PrivateSpaceMaintainer sPrivateSpaceMaintainer;
|
||||
|
||||
@@ -59,6 +60,9 @@ public class PrivateSpaceMaintainer {
|
||||
/** This is the default value for the hide private space entry point settings. */
|
||||
public static final int HIDE_PRIVATE_SPACE_ENTRY_POINT_DISABLED_VAL = 0;
|
||||
public static final int HIDE_PRIVATE_SPACE_ENTRY_POINT_ENABLED_VAL = 1;
|
||||
/** Default value for private space auto lock settings. */
|
||||
@Settings.Secure.PrivateSpaceAutoLockOption
|
||||
public static final int PRIVATE_SPACE_AUTO_LOCK_DEFAULT_VAL = PRIVATE_SPACE_AUTO_LOCK_NEVER;
|
||||
|
||||
public enum ErrorDeletingPrivateSpace {
|
||||
DELETE_PS_ERROR_NONE,
|
||||
@@ -223,6 +227,14 @@ public class PrivateSpaceMaintainer {
|
||||
Settings.Secure.putInt(mContext.getContentResolver(), HIDE_PRIVATESPACE_ENTRY_POINT, value);
|
||||
}
|
||||
|
||||
/** Sets the setting for private space auto lock option. */
|
||||
public void setPrivateSpaceAutoLockSetting(
|
||||
@Settings.Secure.PrivateSpaceAutoLockOption int value) {
|
||||
if (isPrivateSpaceAutoLockSupported()) {
|
||||
Settings.Secure.putInt(mContext.getContentResolver(), PRIVATE_SPACE_AUTO_LOCK, value);
|
||||
}
|
||||
}
|
||||
|
||||
/** @return the setting to show PS entry point. */
|
||||
public int getHidePrivateSpaceEntryPointSetting() {
|
||||
return Settings.Secure.getInt(
|
||||
@@ -231,6 +243,18 @@ public class PrivateSpaceMaintainer {
|
||||
HIDE_PRIVATE_SPACE_ENTRY_POINT_DISABLED_VAL);
|
||||
}
|
||||
|
||||
/** @return the setting for PS auto lock option. */
|
||||
@Settings.Secure.PrivateSpaceAutoLockOption
|
||||
public int getPrivateSpaceAutoLockSetting() {
|
||||
if (isPrivateSpaceAutoLockSupported()) {
|
||||
return Settings.Secure.getInt(
|
||||
mContext.getContentResolver(),
|
||||
PRIVATE_SPACE_AUTO_LOCK,
|
||||
PRIVATE_SPACE_AUTO_LOCK_DEFAULT_VAL);
|
||||
}
|
||||
return PRIVATE_SPACE_AUTO_LOCK_DEFAULT_VAL;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if private space exists and quiet mode is successfully enabled, otherwise
|
||||
* returns false
|
||||
@@ -264,6 +288,7 @@ public class PrivateSpaceMaintainer {
|
||||
|
||||
private void resetPrivateSpaceSettings() {
|
||||
setHidePrivateSpaceEntryPointSetting(HIDE_PRIVATE_SPACE_ENTRY_POINT_DISABLED_VAL);
|
||||
setPrivateSpaceAutoLockSetting(PRIVATE_SPACE_AUTO_LOCK_DEFAULT_VAL);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -275,4 +300,9 @@ public class PrivateSpaceMaintainer {
|
||||
Settings.Secure.putIntForUser(mContext.getContentResolver(), USER_SETUP_COMPLETE,
|
||||
1, mUserHandle.getIdentifier());
|
||||
}
|
||||
|
||||
private boolean isPrivateSpaceAutoLockSupported() {
|
||||
return android.os.Flags.allowPrivateProfile()
|
||||
&& android.multiuser.Flags.supportAutolockForPrivateSpace();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user