diff options
| author | 2023-10-25 21:17:00 +0000 | |
|---|---|---|
| committer | 2023-10-25 21:17:00 +0000 | |
| commit | 3b08a6ac92f3f1b1645429b078fa0139a6a5b43c (patch) | |
| tree | 738a0f35f9b296ca6f5c1e6b195ae51e0f180dbf | |
| parent | e2377b5ba23429c78c850c939fee4b44d68150ea (diff) | |
| parent | b7b3f224c0dd8302cb9143a60d6aae7456a9e7ec (diff) | |
Merge "Use separate Settings entry to hide Private space entry point in All Apps" into main
| -rw-r--r-- | core/java/android/provider/Settings.java | 7 | ||||
| -rw-r--r-- | packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 4bb401af0c13..a2f1ce1e0efa 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -12067,6 +12067,13 @@ public final class Settings { public static final String DND_CONFIGS_MIGRATED = "dnd_settings_migrated"; /** + * Controls whether to hide private space entry point in All Apps + * + * @hide + */ + public static final String HIDE_PRIVATESPACE_ENTRY_POINT = "hide_privatespace_entry_point"; + + /** * These entries are considered common between the personal and the managed profile, * since the managed profile doesn't get to change them. */ diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 7bca944033d9..9dacadef38d5 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -904,6 +904,7 @@ public class SettingsBackupTest { Settings.Secure.EXTRA_AUTOMATIC_POWER_SAVE_MODE, Settings.Secure.GAME_DASHBOARD_ALWAYS_ON, Settings.Secure.HDMI_CEC_SET_MENU_LANGUAGE_DENYLIST, + Settings.Secure.HIDE_PRIVATESPACE_ENTRY_POINT, Settings.Secure.LAUNCHER_TASKBAR_EDUCATION_SHOWING, Settings.Secure.LOCATION_COARSE_ACCURACY_M, Settings.Secure.LOCATION_SHOW_SYSTEM_OPS, |