This takses care to add an entry point in Settings->System->Reset options->Delete private space when private space feature is supported on the device. Entry point appears both when private space exists and also when private is not created. On selecting asks for user authentication and on successful authentication using device lock shows a dialog asking for confirmation and calls for deletion private space. Based on this entrypoint it would not be possible to guess if private space exists on the device. Recording link : b/329041740#comment3 Bug: 329041740 Test: atest ResetOptionsDeletePrivateSpaceControllerTest and verified this doesn't give away existence of private space Change-Id: I9a5b908e7a3f9edaf609cf7e6a87f9842d689ce6
74 lines
3.2 KiB
XML
74 lines
3.2 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
Copyright (C) 2017 The Android Open Source Project
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
-->
|
|
|
|
<PreferenceScreen
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
|
android:title="@string/reset_dashboard_title">
|
|
|
|
<!-- Mobile Network reset -->
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="network_reset_mobile_network_settings_pref"
|
|
android:title="@string/reset_mobile_network_settings_title"
|
|
settings:userRestriction="no_network_reset"
|
|
settings:useAdminDisabledSummary="true"
|
|
settings:isPreferenceVisible="@bool/config_show_sim_info"
|
|
android:fragment="com.android.settings.ResetNetwork" />
|
|
|
|
<!-- Bluetooth and WiFi reset -->
|
|
<com.android.settings.spa.preference.ComposePreference
|
|
android:key="network_reset_bluetooth_wifi_pref"
|
|
android:title="@string/reset_bluetooth_wifi_title"
|
|
settings:controller="com.android.settings.network.BluetoothWiFiResetPreferenceController" />
|
|
|
|
<!-- Reset app preferences -->
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="reset_app_prefs"
|
|
android:title="@string/reset_app_preferences"
|
|
settings:userRestriction="no_control_apps" />
|
|
|
|
<!-- Erase Euicc data -->
|
|
<Preference
|
|
android:key="erase_euicc_data"
|
|
android:title="@string/reset_esim_title"
|
|
settings:isPreferenceVisible="@bool/config_show_sim_info"
|
|
settings:controller="com.android.settings.network.EraseEuiccDataController" />
|
|
|
|
<!-- Delete private space -->
|
|
<Preference
|
|
android:key="reset_delete_private_space"
|
|
android:title="@string/reset_private_space_delete_title"
|
|
settings:controller="com.android.settings.privatespace.delete.ResetOptionsDeletePrivateSpaceController" />
|
|
|
|
<!-- Factory reset -->
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="factory_reset"
|
|
android:title="@string/main_clear_title"
|
|
settings:keywords="@string/keywords_factory_data_reset"
|
|
settings:userRestriction="no_factory_reset"
|
|
settings:useAdminDisabledSummary="true"
|
|
settings:controller="com.android.settings.system.FactoryResetPreferenceController"
|
|
android:fragment="com.android.settings.MainClear" />
|
|
|
|
<Preference
|
|
android:key="factory_reset_demo_user"
|
|
android:title="@string/main_clear_title"
|
|
settings:keywords="@string/keywords_factory_data_reset"
|
|
settings:controller="com.android.settings.system.FactoryResetDemoUserPreferenceController"
|
|
android:fragment="com.android.settings.MainClear" />
|
|
</PreferenceScreen>
|