Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Android 24Q2 Release (ab/11526283) to aosp-main-future

Browse Source 
Bug: 337098550
Merged-In: I96574a79eba581db95d387f0d9c9fde2e004c41c
Change-Id: Ib9f2c742f8aa72651ef9eca80a716dd94b9041ea
This commit is contained in:
Xin Li
2024-05-23 14:12:07 -07:00
parent 418897702e a6f283382a
commit f0e00b8bf7
1413 changed files with 69959 additions and 31812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/accessibility_audio_routing_fragment.xml
View File

@@ -46,10 +46,10 @@
android:entries="@array/bluetooth_audio_routing_titles"
android:entryValues="@array/bluetooth_audio_routing_values"
android:summary="%s"
android:key="audio_routing_system_sounds"
android:key="audio_routing_notification"
android:persistent="false"
android:title="@string/bluetooth_system_sounds_title"
settings:controller="com.android.settings.accessibility.HearingDeviceSystemSoundsRoutingPreferenceController" />
android:title="@string/bluetooth_notification_title"
settings:controller="com.android.settings.accessibility.HearingDeviceNotificationRoutingPreferenceController" />
<com.android.settings.accessibility.AccessibilityFooterPreference
android:key="hearing_device_footer"

10
res/xml/accessibility_color_and_motion.xml
View File

@@ -21,6 +21,16 @@
android:persistent="false"
android:title="@string/accessibility_color_and_motion_title">
<Preference
android:fragment="com.android.settings.accessibility.ColorContrastFragment"
android:key="color_contrast"
android:icon="@drawable/ic_color_contrast"
android:persistent="false"
android:title="@string/accessibility_color_contrast_title"
android:summary="@string/accessibility_color_contrast_summary"
settings:controller="com.android.settings.accessibility.ContrastPreferenceController"
settings:searchable="true"/>
<Preference
android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
android:icon="@drawable/ic_daltonizer"

46
res/xml/accessibility_color_contrast.xml Normal file
View File

@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2024 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:persistent="false"
android:title="@string/accessibility_color_contrast_title">
<com.android.settingslib.widget.TopIntroPreference
android:title="@string/accessibility_color_contrast_intro" />
<com.android.settingslib.widget.LayoutPreference
android:key="color_contrast_selector"
android:selectable="false"
android:layout="@layout/accessibility_color_contrast_selector"
settings:controller="com.android.settings.accessibility.ContrastSelectorPreferenceController"/>
<SwitchPreferenceCompat
android:key="toggle_high_text_contrast_preference"
android:persistent="false"
android:summary="@string/accessibility_toggle_maximize_text_contrast_preference_summary"
android:title="@string/accessibility_toggle_maximize_text_contrast_preference_title"
settings:controller=
"com.android.settings.accessibility.HighTextContrastPreferenceController" />
<com.android.settings.accessibility.AccessibilityFooterPreference
android:title="@string/color_contrast_note"
android:selectable="false"
settings:searchable="false"/>
</PreferenceScreen>

83
res/xml/accessibility_edit_shortcuts.xml Normal file
View File

@@ -0,0 +1,83 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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">
<PreferenceCategory
android:key="@string/accessibility_shortcut_description_pref">
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_fab_pref"
android:persistent="false"
android:selectable="true"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.FloatingButtonShortcutOptionController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_gesture_pref"
android:persistent="false"
android:selectable="true"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.GestureShortcutOptionController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_nav_button_pref"
android:persistent="false"
android:selectable="true"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.NavButtonShortcutOptionController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_volume_keys_pref"
android:persistent="false"
android:selectable="true"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.VolumeKeysShortcutOptionController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_two_fingers_double_tap_pref"
android:persistent="false"
android:selectable="true"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.TwoFingersDoubleTapShortcutOptionController" />
<Preference
android:icon="@drawable/ic_keyboard_arrow_down"
android:key="@string/accessibility_shortcuts_advanced_collapsed"
android:persistent="false"
android:selectable="true"
android:title="@string/accessibility_shortcut_edit_dialog_title_advance"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.AdvancedShortcutsPreferenceController" />
<com.android.settings.accessibility.shortcuts.ShortcutOptionPreference
android:key="@string/accessibility_shortcut_triple_tap_pref"
android:persistent="false"
android:selectable="true"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false"
settings:controller="com.android.settings.accessibility.shortcuts.TripleTapShortcutOptionController" />
</PreferenceCategory>
</PreferenceScreen>

4
res/xml/accessibility_hearing_aids.xml
View File

@@ -28,11 +28,11 @@
settings:controller="com.android.settings.accessibility.AvailableHearingDevicePreferenceController"/>
<com.android.settingslib.RestrictedPreference
android:key="add_bt_devices"
android:key="hearing_device_add_bt_devices"
android:title="@string/bluetooth_pairing_pref_title"
android:icon="@drawable/ic_add_24dp"
android:summary="@string/connected_device_add_device_summary"
android:fragment="com.android.settings.accessibility.HearingDevicePairingDetail"
android:fragment="com.android.settings.accessibility.HearingDevicePairingFragment"
settings:userRestriction="no_config_bluetooth"
settings:useAdminDisabledSummary="true"
settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"/>

31
res/xml/accessibility_settings.xml
View File

@@ -105,6 +105,37 @@
</PreferenceCategory>
<PreferenceCategory
android:key="physical_keyboard_options_category"
android:persistent="false"
android:title="@string/keyboard_category_title">
<SwitchPreferenceCompat
android:icon="@drawable/ic_sticky_keys"
android:key="toggle_keyboard_sticky_keys"
android:persistent="false"
android:summary="@string/sticky_keys_summary"
android:title="@string/sticky_keys"
settings:controller="com.android.settings.accessibility.KeyboardStickyKeyPreferenceController"
settings:searchable="true" />
<SwitchPreferenceCompat
android:icon="@drawable/ic_bounce_keys"
android:key="toggle_keyboard_bounce_keys"
android:persistent="false"
android:title="@string/bounce_keys"
settings:controller="com.android.settings.accessibility.KeyboardBounceKeyPreferenceController"
settings:searchable="true" />
<SwitchPreferenceCompat
android:icon="@drawable/ic_slow_keys"
android:key="toggle_keyboard_slow_keys"
android:persistent="false"
android:title="@string/slow_keys"
settings:controller="com.android.settings.accessibility.KeyboardSlowKeyPreferenceController"
settings:searchable="true" />
</PreferenceCategory>
<PreferenceCategory
android:key="captions_category"
android:persistent="false"

4
res/xml/accessibility_text_reading_options.xml
View File

@@ -57,9 +57,7 @@
android:key="toggle_high_text_contrast_preference"
android:persistent="false"
android:summary="@string/accessibility_toggle_high_text_contrast_preference_summary"
android:title="@string/accessibility_toggle_high_text_contrast_preference_title"
settings:controller=
"com.android.settings.accessibility.HighTextContrastPreferenceController" />
android:title="@string/accessibility_toggle_high_text_contrast_preference_title" />
<com.android.settings.accessibility.TextReadingResetPreference
android:key="reset"

7
res/xml/accounts_dashboard_settings_credman.xml
View File

@@ -18,7 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="user_and_account_settings_screen"
android:title="@string/account_dashboard_title"
android:title="@string/account_dashboard_title_with_passkeys"
settings:keywords="@string/keywords_accounts">
<PreferenceCategory
@@ -26,15 +26,14 @@
android:order="10"
android:title="@string/credman_chosen_app_title">
<com.android.settings.widget.GearPreference
android:fragment="com.android.settings.applications.credentials.DefaultCombinedPicker"
<com.android.settings.applications.credentials.PrimaryProviderPreference
android:key="default_credman_autofill_main"
android:title="@string/credman_chosen_app_title"
settings:keywords="@string/credman_autofill_keywords">
<extra
android:name="for_work"
android:value="false" />
</com.android.settings.widget.GearPreference>
</com.android.settings.applications.credentials.PrimaryProviderPreference>
</PreferenceCategory>
<PreferenceCategory

7
res/xml/accounts_personal_dashboard_settings_credman.xml
View File

@@ -19,7 +19,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="user_and_account_settings_screen"
android:title="@string/account_dashboard_title"
android:title="@string/account_dashboard_title_with_passkeys"
settings:keywords="@string/keywords_accounts">
<PreferenceCategory
@@ -27,15 +27,14 @@
android:order="10"
android:title="@string/credman_chosen_app_title">
<com.android.settings.widget.GearPreference
android:fragment="com.android.settings.applications.credentials.DefaultCombinedPicker"
<com.android.settings.applications.credentials.PrimaryProviderPreference
android:key="default_credman_autofill_main"
android:title="@string/credman_chosen_app_title"
settings:keywords="@string/credman_autofill_keywords">
<extra
android:name="for_work"
android:value="false" />
</com.android.settings.widget.GearPreference>
</com.android.settings.applications.credentials.PrimaryProviderPreference>
</PreferenceCategory>
<PreferenceCategory

7
res/xml/accounts_private_dashboard_settings_credman.xml
View File

@@ -19,7 +19,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="user_and_account_settings_screen"
android:title="@string/account_dashboard_title"
android:title="@string/account_dashboard_title_with_passkeys"
settings:keywords="@string/keywords_accounts">
<PreferenceCategory
@@ -27,8 +27,7 @@
android:order="10"
android:title="@string/credman_chosen_app_title">
<com.android.settings.widget.GearPreference
android:fragment="com.android.settings.applications.credentials.DefaultCombinedPickerPrivate"
<com.android.settings.applications.credentials.PrimaryProviderPreference
android:key="default_credman_autofill_private"
android:title="@string/credman_chosen_app_title"
settings:searchable="false">
@@ -36,7 +35,7 @@
<extra
android:name="for_work"
android:value="false" />
</com.android.settings.widget.GearPreference>
</com.android.settings.applications.credentials.PrimaryProviderPreference>
</PreferenceCategory>
<PreferenceCategory

7
res/xml/accounts_work_dashboard_settings_credman.xml
View File

@@ -19,7 +19,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="user_and_account_settings_screen"
android:title="@string/account_dashboard_title"
android:title="@string/account_dashboard_title_with_passkeys"
settings:keywords="@string/keywords_accounts">
<PreferenceCategory
@@ -27,15 +27,14 @@
android:order="10"
android:title="@string/credman_chosen_app_title">
<com.android.settings.widget.GearPreference
android:fragment="com.android.settings.applications.credentials.DefaultCombinedPickerWork"
<com.android.settings.applications.credentials.PrimaryProviderPreference
android:key="default_credman_autofill_main_work"
android:title="@string/credman_chosen_app_title"
settings:searchable="false">
<extra
android:name="for_work"
android:value="true" />
</com.android.settings.widget.GearPreference>
</com.android.settings.applications.credentials.PrimaryProviderPreference>
</PreferenceCategory>
<PreferenceCategory

2
res/xml/app_ops_permissions_details.xml
View File

@@ -17,7 +17,7 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto">
<com.android.settings.widget.FilterTouchesSwitchPreference
<com.android.settingslib.RestrictedSwitchPreference
android:key="app_ops_settings_switch" />
<com.android.settingslib.widget.FooterPreference

36
res/xml/audio_stream_details_fragment.xml
View File

@@ -1,36 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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="Audio stream details">
<com.android.settingslib.widget.LayoutPreference
android:key="audio_stream_header"
android:layout="@layout/settings_entity_header"
android:selectable="false"
settings:allowDividerBelow="true"
settings:searchable="false"
settings:controller="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamHeaderController" />
<com.android.settingslib.widget.ActionButtonsPreference
android:key="audio_stream_button"
settings:allowDividerBelow="true"
settings:controller="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamButtonController" />
</PreferenceScreen>

52
res/xml/bluetooth_audio_sharing.xml
View File

@@ -1,52 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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/audio_sharing_title">
<PreferenceCategory
android:key="audio_sharing_device_volume_group"
android:title="Devices listening"
settings:controller="com.android.settings.connecteddevice.audiosharing.AudioSharingDeviceVolumeGroupController" />
<Preference
android:icon="@drawable/ic_audio_calls_and_alarms"
android:key="calls_and_alarms"
android:summary=""
android:title="@string/calls_and_alarms_device_title"
settings:controller="com.android.settings.connecteddevice.audiosharing.CallsAndAlarmsPreferenceController" />
<com.android.settings.connecteddevice.audiosharing.AudioSharingNamePreference
android:key="audio_sharing_stream_name"
android:summary="********"
android:title="Stream name"
settings:controller="com.android.settings.connecteddevice.audiosharing.AudioSharingNamePreferenceController" />
<PreferenceCategory
android:key="audio_streams_settings_category"
android:title="@string/audio_streams_category_title"
settings:controller="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsCategoryController">
<Preference
android:fragment="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsDashboardFragment"
android:icon="@drawable/ic_chevron_right_24dp"
android:key="audio_streams_settings"
android:title="@string/audio_streams_pref_title" />
</PreferenceCategory>
</PreferenceScreen>

40
res/xml/bluetooth_audio_streams.xml
View File

@@ -1,40 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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/audio_streams_title">
<Preference
android:key="audio_streams_scan_qr_code"
android:title="@string/bluetooth_find_broadcast_button_scan"
android:icon="@drawable/ic_add_24dp"
android:summary="@string/audio_streams_qr_code_summary"
settings:controller="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsScanQrCodeController" />
<Preference
android:key="audio_streams_active_device"
android:title="Listen with"
settings:controller="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsActiveDeviceController" />
<com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsProgressCategoryPreference
android:key="audio_streams_nearby_category"
android:title="@string/audio_streams_pref_title"
settings:controller="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsProgressCategoryController" />
</PreferenceScreen>

57
res/xml/bluetooth_audio_streams_qr_code.xml
View File

@@ -1,57 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingLeft="25dp"
android:paddingRight="25dp"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start"
android:textSize="15sp"
android:textColor="?android:attr/textColorPrimary"
android:text="Scan this QR code with another device connected to LE audio headphones to start sharing audio"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:paddingTop="70dp">
<ImageView
android:id="@+id/qrcode_view"
android:layout_width="@dimen/qrcode_size"
android:layout_height="@dimen/qrcode_size"
android:src="@android:color/transparent"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>

3
res/xml/bluetooth_device_details_fragment.xml
View File

@@ -80,6 +80,9 @@
<PreferenceCategory
android:key="bluetooth_profiles"/>
<PreferenceCategory
android:key="bt_extra_options"/>
<PreferenceCategory
android:key="bluetooth_related_tools"
android:title="@string/bluetooth_screen_related">

5
res/xml/bluetooth_screen.xml
View File

@@ -18,6 +18,11 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/bluetooth_settings_title">
<SwitchPreferenceCompat
android:key="bluetooth_auto_on_settings_toggle"
android:title="@string/bluetooth_screen_auto_on_title"
settings:controller="com.android.settings.bluetooth.BluetoothAutoOnPreferenceController"/>
<Preference
android:key="bluetooth_screen_bt_pair_rename_devices"
android:title="@string/bluetooth_device_name"

3
res/xml/configure_notification_settings.xml
View File

@@ -27,8 +27,7 @@
android:order="10"
android:title="@string/app_notification_field"
android:summary="@string/app_notification_field_summary"
android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
settings:searchable="false">
android:fragment="com.android.settings.applications.manageapplications.ManageApplications">
<extra
android:name="classname"
android:value="com.android.settings.Settings$NotificationAppListActivity"/>

64
res/xml/connected_devices.xml
View File

@@ -23,42 +23,28 @@
<com.android.settings.slices.SlicePreference
android:key="bt_nearby_slice"
android:title="@string/summary_placeholder"
settings:controller="com.android.settings.slices.SlicePreferenceController"
settings:allowDividerBelow="true"/>
<PreferenceCategory
android:key="audio_sharing_device_list"
android:title="@string/audio_sharing_title"
settings:controller="com.android.settings.connecteddevice.audiosharing.AudioSharingDevicePreferenceController">
<Preference
android:fragment="com.android.settings.connecteddevice.audiosharing.AudioSharingDashboardFragment"
android:key="connected_device_audio_sharing_settings"
android:title="@string/audio_sharing_title"
android:icon="@drawable/ic_bt_audio_sharing"
android:order="10"
settings:controller="com.android.settings.connecteddevice.audiosharing.AudioSharingPreferenceController"/>
</PreferenceCategory>
settings:allowDividerBelow="true"
settings:controller="com.android.settings.slices.SlicePreferenceController" />
<PreferenceCategory
android:key="available_device_list"
android:title="@string/connected_device_media_device_title"
settings:controller="com.android.settings.connecteddevice.AvailableMediaDeviceGroupController"/>
android:title="@string/connected_device_media_device_title"/>
<PreferenceCategory
android:key="connected_device_list"
android:title="@string/connected_device_other_device_title"
settings:controller="com.android.settings.connecteddevice.ConnectedDeviceGroupController"/>
settings:controller="com.android.settings.connecteddevice.ConnectedDeviceGroupController" />
<com.android.settingslib.RestrictedPreference
android:key="add_bt_devices"
android:title="@string/bluetooth_pairing_pref_title"
android:icon="@drawable/ic_add_24dp"
android:summary="@string/connected_device_add_device_summary"
android:fragment="com.android.settings.bluetooth.BluetoothPairingDetail"
android:icon="@drawable/ic_add_24dp"
android:key="add_bt_devices"
android:summary="@string/connected_device_add_device_summary"
android:title="@string/bluetooth_pairing_pref_title"
settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"
settings:keywords="@string/keywords_add_bt_device"
settings:userRestriction="no_config_bluetooth"
settings:useAdminDisabledSummary="true"
settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"/>
settings:userRestriction="no_config_bluetooth" />
<PreferenceCategory
android:key="previously_connected_devices"
@@ -66,12 +52,12 @@
settings:controller="com.android.settings.connecteddevice.PreviouslyConnectedDevicePreferenceController">
<Preference
android:key="previously_connected_devices_see_all"
android:title="@string/previous_connected_see_all"
android:fragment="com.android.settings.connecteddevice.PreviouslyConnectedDeviceDashboardFragment"
android:icon="@drawable/ic_chevron_right_24dp"
android:key="previously_connected_devices_see_all"
android:order="10"
settings:searchable="false"
android:fragment="com.android.settings.connecteddevice.PreviouslyConnectedDeviceDashboardFragment"/>
android:title="@string/previous_connected_see_all"
settings:searchable="false" />
</PreferenceCategory>
<PreferenceCategory
@@ -81,27 +67,27 @@
"com.android.settings.connecteddevice.fastpair.FastPairDevicePreferenceController">
<Preference
android:key="fast_pair_devices_see_all"
android:title="@string/connected_device_fast_pair_device_see_all"
android:icon="@drawable/ic_chevron_right_24dp"
android:order="10"
settings:searchable="false"
android:fragment=
"com.android.settings.connecteddevice.fastpair.FastPairDeviceDashboardFragment"/>
"com.android.settings.connecteddevice.fastpair.FastPairDeviceDashboardFragment"
android:icon="@drawable/ic_chevron_right_24dp"
android:key="fast_pair_devices_see_all"
android:order="10"
android:title="@string/connected_device_fast_pair_device_see_all"
settings:searchable="false" />
</PreferenceCategory>
<Preference
android:key="connection_preferences"
android:title="@string/connected_device_connections_title"
android:summary="@string/summary_placeholder"
android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment"
android:key="connection_preferences"
android:summary="@string/summary_placeholder"
android:title="@string/connected_device_connections_title"
settings:allowDividerAbove="true"
settings:controller="com.android.settings.connecteddevice.AdvancedConnectedDeviceController"/>
settings:controller="com.android.settings.connecteddevice.AdvancedConnectedDeviceController" />
<com.android.settingslib.widget.FooterPreference
android:key="discoverable_footer"
android:title="@string/bluetooth_off_footer"
android:selectable="false"
android:title="@string/bluetooth_off_footer"
settings:controller="com.android.settings.connecteddevice.DiscoverableFooterPreferenceController">
</com.android.settingslib.widget.FooterPreference>

41
res/xml/connected_devices_advanced.xml
View File

@@ -21,37 +21,30 @@
<Preference
android:fragment="com.android.settings.connecteddevice.BluetoothDashboardFragment"
android:key="bluetooth_switchbar_screen"
android:title="@string/bluetooth_settings_title"
android:icon="@*android:drawable/ic_settings_bluetooth"
android:order="-9"/>
android:key="bluetooth_switchbar_screen"
android:order="-10"
android:title="@string/bluetooth_settings_title" />
<Preference
android:fragment="com.android.settings.connecteddevice.audiosharing.AudioSharingDashboardFragment"
android:key="audio_sharing_settings"
android:title="@string/audio_sharing_title"
android:icon="@drawable/ic_bt_audio_sharing"
settings:controller="com.android.settings.connecteddevice.audiosharing.AudioSharingPreferenceController"/>
<Preference
<com.android.settingslib.RestrictedPreference
android:fragment="com.android.settings.connecteddevice.NfcAndPaymentFragment"
android:key="nfc_and_payment_settings"
android:title="@string/nfc_quick_toggle_title"
android:icon="@drawable/ic_nfc"
android:key="nfc_and_payment_settings"
android:order="-7"
settings:searchable="false"
android:title="@string/nfc_quick_toggle_title"
settings:controller="com.android.settings.connecteddevice.NfcAndPaymentFragmentController"
settings:userRestriction="no_near_field_communication_radio"
settings:useAdminDisabledSummary="true"/>
settings:searchable="false"
settings:useAdminDisabledSummary="true"
settings:userRestriction="no_near_field_communication_radio" />
<Preference
android:fragment="com.android.settings.wfd.WifiDisplaySettings"
android:key="wifi_display_settings"
android:title="@string/wifi_display_settings_title"
android:icon="@drawable/ic_cast_24dp"
android:key="wifi_display_settings"
android:order="-6"
android:title="@string/wifi_display_settings_title"
settings:controller="com.android.settings.wfd.WifiDisplayPreferenceController"
settings:keywords="@string/keywords_wifi_display_settings"/>
settings:keywords="@string/keywords_wifi_display_settings" />
<com.android.settingslib.RestrictedPreference
android:fragment="com.android.settings.connecteddevice.threadnetwork.ThreadNetworkFragment"
@@ -72,17 +65,17 @@
android:summary="@string/summary_placeholder"
android:title="@string/print_settings" />
<SwitchPreferenceCompat
<com.android.settingslib.RestrictedSwitchPreference
android:key="uwb_settings"
android:title="@string/uwb_settings_title"
android:order="100"
android:summary="@string/summary_placeholder"
android:title="@string/uwb_settings_title"
settings:controller="com.android.settings.uwb.UwbPreferenceController"
settings:userRestriction="no_ultra_wideband_radio"
settings:useAdminDisabledSummary="true"/>
settings:useAdminDisabledSummary="true"
settings:userRestriction="no_ultra_wideband_radio" />
<PreferenceCategory
android:key="dashboard_tile_placeholder"
android:order="-8"/>
android:order="-8" />
</PreferenceScreen>

6
res/xml/date_time_prefs.xml
View File

@@ -57,7 +57,7 @@
settings:controller="com.android.settings.datetime.LocationProviderStatusPreferenceController"/>
<!-- This preference gets removed if location-based time zone detection is not supported -->
<SwitchPreference
<SwitchPreferenceCompat
android:key="location_time_zone_detection"
android:title="@string/location_time_zone_detection_toggle_title"
settings:controller="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceController"/>
@@ -77,12 +77,12 @@
android:key="time_format_preference_category"
android:title="@string/time_format_category_title"
settings:keywords="@string/keywords_time_format">
<SwitchPreference
<SwitchPreferenceCompat
android:key="auto_24hour"
android:title="@string/date_time_24hour_auto"
settings:controller="com.android.settings.datetime.AutoTimeFormatPreferenceController" />
<SwitchPreference
<SwitchPreferenceCompat
android:key="24 hour"
android:title="@string/date_time_24hour"
settings:controller="com.android.settings.datetime.TimeFormatPreferenceController" />

17
res/xml/development_settings.xml
View File

@@ -261,6 +261,11 @@
android:title="@string/enable_angle_as_system_driver"
android:summary="@string/enable_angle_as_system_driver_summary" />
<SwitchPreferenceCompat
android:key="disable_game_default_frame_rate"
android:title="@string/disable_game_default_frame_rate_title"
android:summary="@string/disable_game_default_frame_rate_summary"/>
<Preference
android:key="graphics_driver_dashboard"
android:title="@string/graphics_driver_dashboard_title"
@@ -368,6 +373,13 @@
android:title="@string/bluetooth_disable_leaudio"
android:summary="@string/bluetooth_disable_leaudio_summary" />
<ListPreference
android:key="bluetooth_leaudio_mode"
android:title="@string/bluetooth_leaudio_mode"
android:summary="@string/summary_placeholder"
android:entries="@array/bluetooth_leaudio_mode"
android:entryValues="@array/bluetooth_leaudio_mode_values"/>
<SwitchPreferenceCompat
android:key="bluetooth_show_leaudio_device_details"
android:title="@string/bluetooth_show_leaudio_device_details"/>
@@ -698,6 +710,11 @@
android:title="@string/show_notification_channel_warnings"
android:summary="@string/show_notification_channel_warnings_summary" />
<SwitchPreferenceCompat
android:key="disable_screen_share_protections_for_apps_and_notifications"
android:title="@string/disable_screen_share_protections_for_apps_and_notifications"
android:summary="@string/disable_screen_share_protections_for_apps_and_notifications_summary" />
<Preference
android:key="asst_importance_reset"
android:title="@string/asst_importance_reset_title"

5
res/xml/display_settings.xml
View File

@@ -36,6 +36,11 @@
android:title="@string/auto_brightness_title"
android:fragment="com.android.settings.display.AutoBrightnessSettings"
settings:controller="com.android.settings.display.AutoBrightnessPreferenceController"/>
<SwitchPreferenceCompat
android:key="even_dimmer_activated"
android:title="@string/even_dimmer_display_title"
android:summary="@string/even_dimmer_display_summary"
settings:controller="com.android.settings.display.EvenDimmerPreferenceController"/>
</PreferenceCategory>
<PreferenceCategory

8
res/xml/hearing_device_pairing_detail.xml
View File

@@ -32,12 +32,4 @@
settings:useAdminDisabledSummary="true"
settings:controller="com.android.settings.accessibility.ViewAllBluetoothDevicesPreferenceController"/>
</PreferenceCategory>
<com.android.settings.accessibility.AccessibilityFooterPreference
android:key="hearing_device_footer"
android:title="@string/accessibility_hearing_device_footer_summary"
android:selectable="false"
settings:searchable="false"
settings:controller="com.android.settings.accessibility.PairHearingDeviceFooterPreferenceController"/>
</PreferenceScreen>

41
res/xml/hearing_device_pairing_fragment.xml Normal file
View File

@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2023 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/bluetooth_pairing_pref_title">
<com.android.settingslib.widget.TopIntroPreference
settings:searchable="false"
android:title="@string/accessibility_hearing_device_pairing_intro" />
<com.android.settings.bluetooth.BluetoothProgressCategory
android:key="available_hearing_devices"
android:title="@string/accessibility_found_hearing_devices" />
<PreferenceCategory
android:key="more_devices_category"
android:title="@string/accessibility_found_all_devices">
<com.android.settings.accessibility.ArrowPreference
android:key="more_devices"
android:title="@string/accessibility_list_all_devices_title"
settings:searchable="false"
settings:userRestriction="no_config_bluetooth"
settings:useAdminDisabledSummary="true"
settings:controller="com.android.settings.accessibility.ViewAllBluetoothDevicesPreferenceController"/>
</PreferenceCategory>
</PreferenceScreen>

51
res/xml/mobile_network_settings.xml
View File

@@ -49,6 +49,23 @@
android:enabled="false"
settings:controller="com.android.settings.network.telephony.SmsDefaultSubscriptionController"/>
<Preference
android:key="mobile_network_spn"
android:title="@string/mobile_network_spn_title"
android:summary="@string/summary_placeholder"
android:selectable="false"
settings:controller="com.android.settings.network.telephony.MobileNetworkSpnPreferenceController"
settings:allowDividerAbove="true" />
<Preference
android:key="phone_number"
android:title="@string/status_number"
android:summary="@string/summary_placeholder"
android:selectable="false"
settings:controller="com.android.settings.network.telephony.MobileNetworkPhoneNumberPreferenceController"
settings:allowDividerBelow="true"
settings:enableCopying="true"/>
<Preference
android:key="cdma_lte_data_service_key"
android:title="@string/cdma_lte_data_service"
@@ -80,7 +97,7 @@
<Preference
android:key="data_usage_summary"
android:title="@string/mobile_data_usage_title"
android:title="@string/app_cellular_data_usage"
settings:controller="com.android.settings.network.telephony.DataUsagePreferenceController"/>
<com.android.settings.datausage.BillingCyclePreference
@@ -164,6 +181,24 @@
settings:controller="com.android.settings.network.telephony.CarrierSettingsVersionPreferenceController"
settings:enableCopying="true"/>
<!-- IMEI -->
<Preference
android:key="network_mode_imei_info"
android:title="@string/status_imei"
android:summary="@string/summary_placeholder"
settings:keywords="@string/keywords_imei_info"
settings:enableCopying="true"
settings:controller="com.android.settings.network.telephony.MobileNetworkImeiPreferenceController"/>
<!-- EID -->
<com.android.settingslib.CustomDialogPreferenceCompat
android:key="network_mode_eid_info"
android:title="@string/status_eid"
android:summary="@string/device_info_protected_single_press"
android:positiveButtonText="@string/dlg_ok"
android:dialogLayout="@layout/dialog_eid_status"
settings:enableCopying="true"
settings:controller="com.android.settings.network.telephony.MobileNetworkEidPreferenceController"/>
<PreferenceCategory
android:key="calling_category"
android:title="@string/call_category"
@@ -210,9 +245,10 @@
<PreferenceCategory
android:key="network_operators_category_key"
android:title="@string/network_operator_category"
settings:allowDividerBelow="true"
settings:controller="com.android.settings.network.telephony.NetworkPreferenceCategoryController">
<SwitchPreferenceCompat
<com.android.settings.spa.preference.ComposePreference
android:key="auto_select_key"
android:title="@string/select_automatically"
settings:controller="com.android.settings.network.telephony.gsm.AutoSelectPreferenceController"/>
@@ -223,12 +259,19 @@
settings:controller="com.android.settings.network.telephony.gsm.OpenNetworkSelectPagePreferenceController"/>
</PreferenceCategory>
<com.android.settingslib.RestrictedPreference
android:key="telephony_satellite_setting_key"
android:persistent="false"
android:title="@string/satellite_setting_title"
settings:keywords="@string/keywords_satellite_setting"
settings:controller=
"com.android.settings.network.telephony.SatelliteSettingPreferenceController"/>
<!--We want separate APN setting from reset of settings because we want user to change it with caution-->
<com.android.settingslib.RestrictedPreference
android:key="telephony_apn_key"
android:persistent="false"
android:title="@string/mobile_network_apn_title"
settings:allowDividerAbove="true"
settings:keywords="@string/keywords_access_point_names"
settings:controller="com.android.settings.network.telephony.ApnPreferenceController"/>
@@ -251,7 +294,7 @@
android:title="@string/require_cellular_encryption_title"
android:summary="@string/require_cellular_encryption_summary"
settings:controller=
"com.android.settings.network.telephony.NullAlgorithmsPreferenceController" />
"com.android.settings.network.telephony.NullAlgorithmsPreferenceController"/>
<SwitchPreferenceCompat
android:key="nr_advanced_calling"

8
res/xml/more_security_privacy_settings.xml
View File

@@ -93,6 +93,14 @@
settings:controller=
"com.android.settings.sound.MediaControlsLockScreenPreferenceController" />
<!-- Allow software fallback for camera extensions -->
<SwitchPreference
android:key="privacy_camera_extensions_fallback"
android:title="@string/camera_extensions_fallback_title"
android:summary="@string/camera_extensions_fallback_description"
settings:controller=
"com.android.settings.privacy.CameraExtensionsFallbackPreferenceController" />
<!-- Content Capture -->
<!-- NOTE: content capture has a different preference, depending whether or not the
ContentCaptureService implementations defines a custom settings activitiy on its manifest.

6
res/xml/my_device_info.xml
View File

@@ -52,11 +52,12 @@
settings:controller="com.android.settings.deviceinfo.BrandedAccountPreferenceController"/>
<!-- Phone number -->
<com.android.settings.deviceinfo.PhoneNumberSummaryPreference
<Preference
android:key="phone_number"
android:order="3"
android:title="@string/status_number"
android:summary="@string/summary_placeholder"
android:selectable="false"
settings:isPreferenceVisible="@bool/config_show_sim_info"
settings:controller="com.android.settings.deviceinfo.PhoneNumberPreferenceController"
settings:enableCopying="true"/>
@@ -118,7 +119,6 @@
android:key="eid_info"
android:order="31"
android:title="@string/status_eid"
android:summary="@string/device_info_protected_single_press"
android:positiveButtonText="@string/dlg_ok"
android:dialogLayout="@layout/dialog_eid_status"
settings:isPreferenceVisible="@bool/config_show_sim_info"
@@ -126,7 +126,7 @@
settings:controller="com.android.settings.deviceinfo.simstatus.SimEidPreferenceController"/>
<!-- IMEI -->
<com.android.settings.deviceinfo.PhoneNumberSummaryPreference
<Preference
android:key="imei_info"
android:order="32"
android:title="@string/status_imei"

1
res/xml/network_provider_internet.xml
View File

@@ -52,7 +52,6 @@
settings:keywords="@string/keywords_more_mobile_networks"
settings:userRestriction="no_config_mobile_networks"
settings:isPreferenceVisible="@bool/config_show_sim_info"
settings:allowDividerAbove="true"
settings:useAdminDisabledSummary="true"
settings:searchable="@bool/config_show_sim_info"/>

22
res/xml/physical_keyboard_settings.xml
View File

@@ -38,4 +38,26 @@
android:summary="@string/modifier_keys_settings_summary"
android:fragment="com.android.settings.inputmethod.ModifierKeysSettings" />
</PreferenceCategory>
<PreferenceCategory
android:key="keyboard_a11y_category"
android:title="@string/keyboard_a11y_category">
<SwitchPreferenceCompat
android:key="accessibility_sticky_keys"
android:title="@string/sticky_keys"
android:summary="@string/sticky_keys_summary"
android:defaultValue="false" />
<SwitchPreferenceCompat
android:key="accessibility_bounce_keys"
android:title="@string/bounce_keys"
android:defaultValue="false" />
<SwitchPreferenceCompat
android:key="accessibility_slow_keys"
android:title="@string/slow_keys"
android:defaultValue="false" />
</PreferenceCategory>
</PreferenceScreen>

9
res/xml/power_usage_summary.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2023 The Android Open Source Project
<!-- Copyright (C) 2024 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.
@@ -51,6 +51,13 @@
settings:keywords="@string/keywords_battery_saver"
settings:controller="com.android.settings.fuelgauge.BatterySaverController" />
<Preference
android:fragment="com.android.settings.fuelgauge.SmartBatterySettings"
android:key="smart_battery_manager"
android:title="@string/smart_battery_manager_title"
settings:controller="com.android.settings.fuelgauge.batterytip.BatteryManagerPreferenceController"
settings:keywords="@string/keywords_battery_adaptive_preferences" />
<SwitchPreferenceCompat
android:key="battery_percentage"
android:title="@string/battery_percentage"

20
res/xml/private_space_auto_lock_settings.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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"
android:title="@string/private_space_auto_lock_title"/>

47
res/xml/private_space_biometric_settings.xml Normal file
View File

@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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/private_space_biometric_title"
settings:searchable="false">
<com.android.settingslib.widget.TopIntroPreference
android:title="@string/biometric_settings_intro"
settings:searchable="false" />
<PreferenceCategory
android:key="biometric_ways_to_unlock"
android:title="@string/private_space_category_ways_to_unlock"
settings:searchable="false">
<com.android.settingslib.RestrictedPreference
android:key="private_space_fingerprint_unlock_settings"
android:title="@string/private_space_fingerprint_unlock_title"
android:summary="@string/summary_placeholder"
settings:controller="com.android.settings.privatespace.onelock.PrivateSpaceFingerprintPreferenceController"
settings:searchable="false" />
<com.android.settingslib.RestrictedPreference
android:key="private_space_face_unlock_settings"
android:title="@string/private_space_face_unlock_title"
android:summary="@string/summary_placeholder"
settings:controller="com.android.settings.privatespace.onelock.PrivateSpaceFacePreferenceController"
settings:searchable="false" />
</PreferenceCategory>
</PreferenceScreen>

18
res/xml/privatespace_hide_locked.xml → res/xml/private_space_hide_locked.xml
View File

@@ -21,7 +21,7 @@
<com.android.settingslib.widget.IllustrationPreference
android:key="privatespace_hide_video"
settings:searchable="false"
settings:lottie_rawRes="@drawable/privatespace_placeholder_image"/>
settings:lottie_rawRes="@raw/private_space_hide_when_locked_illustration"/>
<com.android.settingslib.widget.MainSwitchPreference
android:key="hide_when_locked"
@@ -34,33 +34,27 @@
android:selectable="false"
settings:searchable="false" />
<Preference
android:key="private_space_note"
android:summary="@string/privatespace_development_note"
android:selectable="false"
settings:searchable="false" />
<PreferenceCategory
android:title="@string/privatespace_unhide_header">
android:title="@string/privatespace_access_header">
<Preference
android:key="search_when_locked_footer"
android:icon="@drawable/counter_1_24dp"
android:title="@string/privatespace_open_settings"
android:title="@string/privatespace_search_description"
android:selectable="false"
settings:searchable="false" />
<Preference
android:key="tap_tile_footer"
android:icon="@drawable/counter_2_24dp"
android:title="@string/privatespace_tap_settings"
android:title="@string/privatespace_tap_tile_description"
android:selectable="false"
settings:searchable="false" />
<Preference
android:key="turn_off_footer"
android:key="unlock_profile_footer"
android:icon="@drawable/counter_3_24dp"
android:title="@string/privatespace_turnoff_hide"
android:title="@string/privatespace_unlock_description"
android:selectable="false"
settings:searchable="false" />

30
res/xml/private_space_settings.xml
View File

@@ -23,9 +23,9 @@
settings:searchable="false">
<com.android.settingslib.widget.IllustrationPreference
android:key="privatespace_hide_video"
android:key="private_space_settings"
settings:searchable="false"
settings:lottie_rawRes="@drawable/privatespace_placeholder_image"/>
settings:lottie_rawRes="@raw/private_space_illustration"/>
<Preference
android:key="private_space_description"
@@ -36,6 +36,13 @@
<PreferenceCategory
android:title="@string/security_header">
<Preference
android:key="private_space_auto_lock"
android:title="@string/private_space_auto_lock_title"
android:fragment="com.android.settings.privatespace.autolock.AutoLockSettingsFragment"
settings:controller="com.android.settings.privatespace.autolock.AutoLockPreferenceController"
settings:searchable="false" />
<Preference
android:key="private_space_use_one_lock"
android:title="@string/private_space_lock_title"
@@ -52,15 +59,32 @@
</PreferenceCategory>
<PreferenceCategory
android:title="@string/private_space_apps_and_notifications_header">
<com.android.settingslib.RestrictedSwitchPreference
android:key="private_space_sensitive_notifications"
android:title="@string/private_space_notifications_title"
android:summary="@string/private_space_sensitive_notifications_description"
settings:controller="com.android.settings.privatespace.HidePrivateSpaceSensitiveNotificationsController" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/private_space_category_system">
<Preference
android:key="private_space_delete"
android:title="@string/private_space_delete_title"
settings:controller="com.android.settings.privatespace.DeletePrivateSpaceController"
settings:controller="com.android.settings.privatespace.delete.DeletePrivateSpaceController"
settings:searchable="false" />
</PreferenceCategory>
<com.android.settings.accessibility.AccessibilityFooterPreference
android:key="private_space_footer"
android:title="@string/private_space_apps_permission_text"
android:selectable="false"
settings:searchable="false"/>
</PreferenceScreen>

6
res/xml/privatespace_one_lock.xml
View File

@@ -34,11 +34,11 @@
android:summary="@string/unlock_set_unlock_mode_pattern"
settings:searchable="false" />
<Preference
<com.android.settingslib.RestrictedPreference
android:key="private_space_biometrics"
android:title="@string/private_space_biometric_title"
android:summary="@string/private_space_biometric_summary"
android:fragment="com.android.settings.privatespace.onelock.FaceFingerprintUnlockFragment"
android:summary="@string/summary_placeholder"
android:fragment="com.android.settings.privatespace.onelock.PrivateSpaceBiometricSettings"
settings:searchable="false" />
</PreferenceScreen>

69
res/xml/process_stats_summary.xml
View File

@@ -19,45 +19,52 @@
android:title="@string/app_memory_use"
android:key="app_list">
<SwitchPreference
android:key="force_enable_pss_profiling"
android:title="@string/force_enable_pss_profiling_title"
android:summary="@string/force_enable_pss_profiling_summary" />
<PreferenceCategory
android:title="@string/average_memory_use"/>
android:title="@string/average_memory_use"
android:key="memory_info">
<com.android.settings.SummaryPreference
android:key="status_header"
android:selectable="false" />
<com.android.settings.SummaryPreference
android:key="status_header"
android:selectable="false" />
<com.android.settings.applications.SpacePreference
android:layout_height="5dp" />
<com.android.settings.applications.SpacePreference
android:layout_height="5dp" />
<Preference
android:key="performance"
android:selectable="false"
android:layout="@layout/horizontal_preference"
android:title="@string/memory_performance" />
<Preference
android:key="performance"
android:selectable="false"
android:layout="@layout/horizontal_preference"
android:title="@string/memory_performance" />
<Preference
android:key="total_memory"
android:selectable="false"
android:layout="@layout/horizontal_preference"
android:title="@string/total_memory" />
<Preference
android:key="total_memory"
android:selectable="false"
android:layout="@layout/horizontal_preference"
android:title="@string/total_memory" />
<Preference
android:key="average_used"
android:selectable="false"
android:layout="@layout/horizontal_preference"
android:title="@string/average_used" />
<Preference
android:key="average_used"
android:selectable="false"
android:layout="@layout/horizontal_preference"
android:title="@string/average_used" />
<Preference
android:key="free"
android:selectable="false"
android:layout="@layout/horizontal_preference"
android:title="@string/free_memory" />
<Preference
android:key="free"
android:selectable="false"
android:layout="@layout/horizontal_preference"
android:title="@string/free_memory" />
<com.android.settings.applications.SpacePreference
android:layout_height="15dp" />
<com.android.settings.applications.SpacePreference
android:layout_height="15dp" />
<Preference
android:key="apps_list"
android:title="@string/memory_usage_apps" />
<Preference
android:key="apps_list"
android:title="@string/memory_usage_apps" />
</PreferenceCategory>
</PreferenceScreen>

65
res/xml/satellite_setting.xml Normal file
View File

@@ -0,0 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2024 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:key="satellite_setting"
android:title="@string/satellite_setting"
settings:keywords="@string/keywords_satellite_setting">
<PreferenceCategory
android:title="@string/category_name_about_satellite_messaging">
<com.android.settingslib.widget.TopIntroPreference
android:key="key_about_satellite_messaging"/>
</PreferenceCategory>
<PreferenceCategory
android:key="key_category_your_satellite_plan"
android:title="@string/category_title_your_satellite_plan">
<Preference
android:key="key_your_satellite_plan"
android:icon="?android:attr/textColorPrimary"/>
</PreferenceCategory>
<PreferenceCategory
android:key="key_category_how_it_works"
android:title="@string/category_name_how_it_works"
android:clickable="false"
android:focusable="false">
<Preference
android:key="key_satellite_connection_guide"
android:title="@string/title_satellite_connection_guide"
android:summary="@string/summary_satellite_connection_guide"
android:icon="@drawable/ic_signal_cellular_nodata_24px"/>
<Preference
android:key="key_supported_service"
android:title="@string/title_supported_service"
android:summary="@string/summary_supported_service"
android:icon="@drawable/ic_satellite_alt_24px"/>
</PreferenceCategory>
<com.android.settingslib.widget.FooterPreference
android:key="satellite_setting_extra_info_footer_pref"
android:layout="@layout/satellite_setting_more_information_layout"
android:selectable="false"
settings:searchable="false"/>
</PreferenceScreen>

2
res/xml/screen_lock_settings.xml
View File

@@ -40,7 +40,7 @@
<!-- available in pin/pattern/password -->
<com.android.settings.display.TimeoutListPreference
<com.android.settings.security.screenlock.ProtectedTimeoutListPreference
android:key="lock_after_timeout"
android:title="@string/lock_after_timeout"
android:summary="@string/summary_placeholder"

2
res/xml/security_settings_fingerprint.xml
View File

@@ -36,7 +36,7 @@
settings:isPreferenceVisible="false">
<com.android.settingslib.RestrictedSwitchPreference
android:key="security_settings_require_screen_on_to_auth"
android:key="@string/security_settings_require_screen_on_to_auth_key"
android:title="@string/security_settings_require_screen_on_to_auth_title"
android:summary="@string/security_settings_require_screen_on_to_auth_description"
settings:keywords="@string/security_settings_require_screen_on_to_auth_keywords"

8
res/xml/special_access.xml
View File

@@ -19,6 +19,14 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/special_access">
<Preference
android:key="run_backup_tasks"
android:title="@string/run_backup_tasks_title"
android:order="-2000"
settings:keywords="@string/keywords_run_backup_tasks"
settings:controller="com.android.settings.spa.app.specialaccess.BackupTasksAppsPreferenceController">
</Preference>
<Preference
android:key="manage_external_storage"
android:title="@string/manage_external_storage_title"

2
res/xml/top_level_settings.xml
View File

@@ -180,7 +180,7 @@
android:icon="@drawable/ic_settings_accounts"
android:key="top_level_accounts"
android:order="-10"
android:title="@string/account_dashboard_title"
android:title="@string/account_dashboard_title_with_passkeys"
android:summary="@string/summary_placeholder"
settings:highlightableMenuKey="@string/menu_key_accounts"
settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>

5
res/xml/trackpad_settings.xml
View File

@@ -49,7 +49,8 @@
android:summary="@string/trackpad_bottom_right_tap_summary"
android:icon="@drawable/ic_trackpad_bottom_right_click"
settings:controller="com.android.settings.inputmethod.TrackpadBottomPreferenceController"
android:order="30"/>
android:order="30"
settings:keywords="@string/keywords_trackpad_bottom_right_tap"/>
<com.android.settings.widget.SeekBarPreference
android:key="trackpad_pointer_speed"
@@ -64,4 +65,4 @@
android:title="@string/trackpad_touch_gesture"
android:icon="@drawable/ic_trackpad_touch_gestures_inverse"
settings:controller="com.android.settings.inputmethod.TouchGesturesButtonPreferenceController"/>
</PreferenceScreen>
</PreferenceScreen>

5
res/xml/wifi_configure_settings.xml
View File

@@ -34,6 +34,11 @@
settings:keywords="@string/keywords_wifi_notify_open_networks"
settings:controller="com.android.settings.wifi.NotifyOpenNetworksPreferenceController"/>
<com.android.settings.spa.preference.ComposePreference
android:key="allow_wep_networks"
android:title="@string/wifi_allow_wep_networks"
settings:controller="com.android.settings.wifi.WepNetworksPreferenceController"/>
<SwitchPreferenceCompat
android:key="wifi_cellular_data_fallback"
android:title="@string/wifi_cellular_data_fallback_title"

5
res/xml/wifi_network_details_fragment2.xml
View File

@@ -97,6 +97,11 @@
android:entries="@array/wifi_privacy_entries"
android:entryValues="@array/wifi_privacy_values"/>
<com.android.settings.spa.preference.ComposePreference
android:key="privacy_settings"
android:title="@string/wifi_privacy_settings"
settings:controller="com.android.settings.wifi.details2.WifiPrivacyPreferenceController"/>
<Preference
android:key="subscription_detail"
android:title="@string/wifi_subscription"