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

Merge 24Q4 (ab/12406339) into aosp-main-future

Browse Source 
Bug: 370570306
Merged-In: Ie90e7495dd4a134538bae6e3e08eea0d02134b14
Change-Id: I20517e9ee410e95f2cbeb1247c0c0288ed9f006f
This commit is contained in:
Xin Li
2024-11-11 21:38:40 -08:00
parent c4d90bf739 658459de9b
commit cfa19e11a6
1597 changed files with 77072 additions and 46403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/xml/accessibility_daltonizer_settings.xml
View File

@@ -32,24 +32,32 @@
android:key="daltonizer_mode_deuteranomaly"
android:persistent="false"
android:summary="@string/daltonizer_mode_deuteranomaly_summary"
android:title="@string/daltonizer_mode_deuteranomaly_title" />
android:title="@string/daltonizer_mode_deuteranomaly_title"
settings:titleMaxLines="@integer/max_integer"
settings:controller="com.android.settings.accessibility.DaltonizerRadioButtonPreferenceController" />
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="daltonizer_mode_protanomaly"
android:persistent="false"
android:summary="@string/daltonizer_mode_protanomaly_summary"
android:title="@string/daltonizer_mode_protanomaly_title" />
android:title="@string/daltonizer_mode_protanomaly_title"
settings:titleMaxLines="@integer/max_integer"
settings:controller="com.android.settings.accessibility.DaltonizerRadioButtonPreferenceController" />
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="daltonizer_mode_tritanomaly"
android:persistent="false"
android:summary="@string/daltonizer_mode_tritanomaly_summary"
android:title="@string/daltonizer_mode_tritanomaly_title" />
android:title="@string/daltonizer_mode_tritanomaly_title"
settings:titleMaxLines="@integer/max_integer"
settings:controller="com.android.settings.accessibility.DaltonizerRadioButtonPreferenceController" />
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="daltonizer_mode_grayscale"
android:persistent="false"
android:title="@string/daltonizer_mode_grayscale_title" />
android:title="@string/daltonizer_mode_grayscale_title"
settings:titleMaxLines="@integer/max_integer"
settings:controller="com.android.settings.accessibility.DaltonizerRadioButtonPreferenceController" />
<com.android.settings.widget.SeekBarPreference
android:key="daltonizer_saturation"

49
res/xml/accessibility_pointer_and_touchpad.xml Normal file
View File

@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 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="accessibility_pointer_and_touchpad"
android:persistent="false"
android:title="@string/accessibility_pointer_and_touchpad_title">
<com.android.settings.widget.LabeledSeekBarPreference
android:key="pointer_scale_preference"
android:title="@string/pointer_scale"
android:max="@integer/pointer_scale_seek_bar_end"
settings:iconStart="@drawable/ic_remove_24dp"
settings:iconStartContentDescription="@string/pointer_scale_decrease_content_description"
settings:iconEnd="@drawable/ic_add_24dp"
settings:iconEndContentDescription="@string/pointer_scale_increase_content_description"
settings:keywords="@string/pointer_scale_keywords"
settings:controller="com.android.settings.inputmethod.PointerScaleSeekBarController" />
<Preference
android:fragment="com.android.settings.inputmethod.PointerColorCustomizationFragment"
android:key="pointer_color_customization_preference"
android:persistent="false"
android:title="@string/accessibility_pointer_color_customization_title"/>
<Preference
android:fragment="com.android.settings.accessibility.ToggleAutoclickPreferenceFragment"
android:key="autoclick_preference"
android:persistent="false"
android:title="@string/accessibility_autoclick_preference_title"
settings:keywords="@string/keywords_auto_click"
settings:controller="com.android.settings.accessibility.AutoclickPreferenceController"/>
</PreferenceScreen>

34
res/xml/accessibility_pointer_color_customization.xml Normal file
View File

@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 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="accessibility_pointer_color_customization"
android:persistent="false"
android:title="@string/accessibility_pointer_color_customization_title">
<com.android.settings.inputmethod.PointerFillStylePreference
android:key="pointer_fill_style"
android:title="@string/pointer_fill_style"
settings:controller="com.android.settings.inputmethod.PointerFillStylePreferenceController"/>
<com.android.settings.inputmethod.PointerStrokeStylePreference
android:key="pointer_stroke_style"
android:title="@string/pointer_stroke_style"
settings:controller="com.android.settings.inputmethod.PointerStrokeStylePreferenceController"/>
</PreferenceScreen>

10
res/xml/accessibility_settings.xml
View File

@@ -110,6 +110,16 @@
settings:keywords="@string/keywords_vibration"
android:summary="@string/accessibility_vibration_settings_summary"/>
<Preference
android:fragment="com.android.settings.inputmethod.PointerTouchpadFragment"
android:key="pointer_and_touchpad"
android:icon="@drawable/ic_pointer_and_touchpad"
android:persistent="false"
android:title="@string/accessibility_pointer_and_touchpad_title"
android:summary="@string/accessibility_pointer_and_touchpad_summary"
settings:controller="com.android.settings.inputmethod.PointerTouchpadPreferenceController"
settings:searchable="true"/>
</PreferenceCategory>
<PreferenceCategory

8
res/xml/accessibility_tap_assistance.xml
View File

@@ -37,12 +37,4 @@
android:title="@string/accessibility_setting_item_control_timeout_title"
settings:controller="com.android.settings.accessibility.AccessibilityTimeoutPreferenceController"
settings:keywords="@string/keywords_accessibility_timeout"/>
<Preference
android:fragment="com.android.settings.accessibility.ToggleAutoclickPreferenceFragment"
android:key="autoclick_preference"
android:persistent="false"
android:title="@string/accessibility_autoclick_preference_title"
settings:keywords="@string/keywords_auto_click"
settings:controller="com.android.settings.accessibility.AutoclickPreferenceController"/>
</PreferenceScreen>

11
res/xml/app_notification_settings.xml
View File

@@ -50,11 +50,22 @@
settings:controller="com.android.settings.notification.app.BubbleSummaryPreferenceController">
</Preference>
<!-- Bundles added here -->
<PreferenceCategory
android:key="bundles"
android:title="@string/notification_bundles"
android:visibility="gone" />
<!-- Channels/Channel groups added here -->
<PreferenceCategory
android:key="channels"
android:layout="@layout/empty_view" />
<Preference
android:key="more"
android:title="@string/no_recent_channels"
android:icon="@drawable/ic_expand"/>
<!-- Importance toggle -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="allow_sound"

3
res/xml/bluetooth_audio_streams_dialog.xml
View File

@@ -45,6 +45,7 @@
<TextView
android:id="@+id/dialog_title"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Headline"
android:textColor="?android:attr/textColorPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
@@ -54,6 +55,7 @@
<TextView
android:id="@+id/dialog_subtitle"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"
android:textColor="?android:attr/textColorSecondary"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -65,6 +67,7 @@
<TextView
android:id="@+id/dialog_subtitle_2"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"
android:textColor="?android:attr/textColorSecondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"

62
res/xml/bluetooth_audio_streams_qr_code.xml
View File

@@ -1,62 +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"/>
<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"/>
<TextView
android:id="@+id/password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="15sp"
android:textColor="?android:attr/textColorPrimary"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>

7
res/xml/bluetooth_device_details_fragment.xml
View File

@@ -26,6 +26,13 @@
settings:allowDividerBelow="true"
settings:searchable="false"/>
<com.android.settingslib.widget.LayoutPreference
android:key="general_bluetooth_device_header"
android:layout="@layout/general_bt_entity_header"
android:selectable="false"
settings:allowDividerBelow="true"
settings:searchable="false"/>
<com.android.settingslib.widget.LayoutPreference
android:key="advanced_bluetooth_device_header"
android:layout="@layout/advanced_bt_entity_header"

24
res/xml/bluetooth_device_more_settings_fragment.xml Normal file
View File

@@ -0,0 +1,24 @@
<?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"
android:key="bluetooth_device_more_settings_screen"
android:title="@string/device_details_more_settings">
<PreferenceCategory
android:key="bluetooth_profiles"/>
</PreferenceScreen>

2
res/xml/dark_mode_settings.xml
View File

@@ -60,6 +60,6 @@
android:title="@string/dark_ui_bedtime_footer_summary"
android:selectable="false"
settings:searchable="false"
settings:controller="com.android.settings.display.darkmode.DarkModeCustomBedtimePreferenceController" />
settings:controller="com.android.settings.display.darkmode.DarkModeCustomModesPreferenceController" />
</PreferenceScreen>

20
res/xml/development_settings.xml
View File

@@ -513,6 +513,11 @@
android:title="@string/show_key_presses"
android:summary="@string/show_key_presses_summary" />
<SwitchPreference
android:key="touchpad_visualizer"
android:title="@string/touchpad_visualizer"
android:summary="@string/touchpad_visualizer_summary" />
</PreferenceCategory>
<PreferenceCategory
@@ -728,11 +733,6 @@
android:title="@string/inactive_apps_title"
android:fragment="com.android.settings.fuelgauge.InactiveApps" />
<Preference
android:key="tare"
android:title="@string/tare_title" >
</Preference>
<SwitchPreferenceCompat
android:key="force_allow_on_external"
android:title="@string/force_allow_on_external"
@@ -743,15 +743,17 @@
android:title="@string/force_resizable_activities"
android:summary="@string/force_resizable_activities_summary" />
<SwitchPreferenceCompat
android:key="override_desktop_mode_features"
android:title="@string/enable_desktop_mode" />
<SwitchPreferenceCompat
android:key="enable_freeform_support"
android:title="@string/enable_freeform_support"
android:summary="@string/enable_freeform_support_summary" />
android:title="@string/enable_freeform_support" />
<SwitchPreferenceCompat
android:key="force_desktop_mode_on_external_displays"
android:title="@string/force_desktop_mode"
android:summary="@string/force_desktop_mode_summary" />
android:title="@string/enable_desktop_mode_on_secondary_display"/>
<SwitchPreferenceCompat
android:key="enable_non_resizable_multi_window"

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

@@ -0,0 +1,20 @@
<?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"
android:title="@string/external_display_resolution_settings_title">
</PreferenceScreen>

21
res/xml/external_display_settings.xml Normal file
View File

@@ -0,0 +1,21 @@
<?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:title="@string/external_display_settings_title">
</PreferenceScreen>

12
res/xml/installed_app_launch_settings.xml
View File

@@ -19,9 +19,15 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/launch_by_default">
<com.android.settingslib.widget.MainSwitchPreference
android:key="open_by_default_supported_links"
android:title="@string/app_launch_open_domain_urls_title"/>
<PreferenceCategory>
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="app_launch_open_in_app"
android:title="@string/app_launch_open_in_app"/>
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="app_launch_open_in_browser"
android:title="@string/app_launch_open_in_browser"/>
</PreferenceCategory>
<PreferenceCategory
android:layout="@layout/preference_category_no_label"

5
res/xml/language_settings.xml
View File

@@ -18,7 +18,8 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/languages_settings">
android:title="@string/languages_settings"
android:key="languages_settings">
<PreferenceCategory
android:key="languages_category"
android:title="@string/locale_picker_category_title">
@@ -68,4 +69,4 @@
android:fragment="com.android.settings.tts.TextToSpeechSettings"
settings:searchable="false"/>
</PreferenceCategory>
</PreferenceScreen>
</PreferenceScreen>

3
res/xml/languages.xml
View File

@@ -18,7 +18,8 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/language_picker_title">
android:title="@string/language_picker_title"
android:key="system_languages">
<com.android.settingslib.widget.TopIntroPreference
android:title="@string/desc_introduction_of_language_picker"

33
res/xml/mobile_network_settings.xml
View File

@@ -85,23 +85,24 @@
android:summary="@string/auto_data_switch_summary"
settings:controller="com.android.settings.network.telephony.AutoDataSwitchPreferenceController"/>
<com.android.settingslib.RestrictedSwitchPreference
<!-- Settings search is handled by RoamingSearchItem. -->
<com.android.settings.spa.preference.ComposePreference
android:key="button_roaming_key"
android:title="@string/roaming"
android:persistent="false"
android:summaryOn="@string/roaming_enable"
android:summaryOff="@string/roaming_disable"
settings:userRestriction="no_data_roaming"
settings:searchable="false"
settings:controller="com.android.settings.network.telephony.RoamingPreferenceController"/>
<!-- Settings search is handled by DataUsageSearchItem. -->
<Preference
android:key="data_usage_summary"
android:title="@string/app_cellular_data_usage"
settings:searchable="false"
settings:controller="com.android.settings.network.telephony.DataUsagePreferenceController"/>
<!-- Settings search is handled by BillingCycleSearchItem. -->
<com.android.settings.datausage.BillingCyclePreference
android:key="billing_preference"
android:title="@string/billing_cycle"
settings:searchable="false"
settings:controller="com.android.settings.datausage.BillingCyclePreferenceController"/>
<SwitchPreferenceCompat
@@ -116,10 +117,12 @@
android:selectable="false"
settings:searchable="false"/>
<!-- Settings search is handled by MmsMessageSearchItem. -->
<SwitchPreferenceCompat
android:key="mms_message"
android:title="@string/mms_message_title"
android:summary="@string/mms_message_summary"
settings:searchable="false"
settings:controller="com.android.settings.network.telephony.MmsMessagePreferenceController"/>
<SwitchPreferenceCompat
@@ -153,6 +156,7 @@
android:summary="@string/contact_discovery_opt_in_summary"
settings:controller="com.android.settings.network.telephony.ContactDiscoveryPreferenceController"/>
<!-- Settings search is handled by PreferredNetworkModeSearchItem. -->
<ListPreference
android:key="preferred_network_mode_key"
android:title="@string/preferred_network_mode_title"
@@ -160,8 +164,10 @@
android:entries="@array/preferred_network_mode_choices"
android:entryValues="@array/preferred_network_mode_values"
android:dialogTitle="@string/preferred_network_mode_dialogtitle"
settings:searchable="false"
settings:controller="com.android.settings.network.telephony.PreferredNetworkModePreferenceController"/>
<!-- Settings search is handled by EnabledNetworkModeSearchItem. -->
<ListPreference
android:key="enabled_networks_key"
android:title="@string/preferred_network_mode_title"
@@ -169,14 +175,14 @@
android:entries="@array/enabled_networks_choices"
android:entryValues="@array/enabled_networks_values"
android:dialogTitle="@string/preferred_network_mode_dialogtitle"
settings:searchable="false"
settings:controller="com.android.settings.network.telephony.EnabledNetworkModePreferenceController"/>
<!-- Settings search is handled by CarrierSettingsVersionSearchItem. -->
<Preference
android:key="carrier_settings_version_key"
android:title="@string/carrier_settings_version"
android:enabled="false"
android:shouldDisableView="false"
android:selectable="false"
settings:searchable="false"
settings:controller="com.android.settings.network.telephony.CarrierSettingsVersionPreferenceController"
settings:enableCopying="true"/>
@@ -203,10 +209,12 @@
android:title="@string/call_category"
settings:controller="com.android.settings.network.telephony.CallingPreferenceCategoryController">
<!-- Settings search is handled by WifiCallingSearchItem. -->
<Preference
android:key="wifi_calling"
android:title="@string/wifi_calling_settings_title"
android:summary="@string/wifi_calling_summary"
settings:searchable="false"
settings:controller="com.android.settings.network.telephony.WifiCallingPreferenceController">
<intent android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
@@ -215,10 +223,11 @@
</intent>
</Preference>
<!-- Settings search is handled by WifiCallingSearchItem. -->
<SwitchPreferenceCompat
android:key="video_calling_key"
android:title="@string/video_calling_settings_title"
android:persistent="true"
settings:searchable="false"
settings:controller="com.android.settings.network.telephony.VideoCallingPreferenceController"/>
</PreferenceCategory>
@@ -295,10 +304,10 @@
settings:controller=
"com.android.settings.network.telephony.NullAlgorithmsPreferenceController"/>
<!-- Settings search is handled by NrAdvancedCallingSearchItem. -->
<com.android.settings.spa.preference.ComposePreference
android:key="nr_advanced_calling"
android:title="@string/nr_advanced_calling_title"
settings:keywords="@string/keywords_nr_advanced_calling"
settings:searchable="false"
settings:controller="com.android.settings.network.telephony.NrAdvancedCallingPreferenceController"/>
</PreferenceCategory>

15
res/xml/modes_calls_settings.xml
View File

@@ -24,14 +24,21 @@
<PreferenceCategory
android:key="zen_mode_settings_category_calls"
android:title="@string/zen_mode_calls_header"
settings:allowDividerBelow="true">
android:title="@string/zen_mode_calls_header">
</PreferenceCategory>
<com.android.settings.applications.SpacePreference
android:key="hearing_aid_space_layout"
android:layout_height="16dp"/>
<!-- Repeat callers -->
<SwitchPreferenceCompat
android:key="zen_mode_repeat_callers"
android:title="@string/zen_mode_repeat_callers_title"
settings:allowDividerAbove="true"/>
android:title="@string/zen_mode_repeat_callers_title" />
<com.android.settingslib.widget.FooterPreference
android:key="info_footer"
android:title="@string/zen_mode_calls_footer"
android:selectable="false"
settings:searchable="false"/>
</PreferenceScreen>

15
res/xml/modes_display_settings.xml
View File

@@ -24,22 +24,27 @@
android:title="@string/mode_display_options_section">
<Preference
android:key="notification_visibility"
android:title="@string/zen_mode_restrict_notifications_title" />
android:title="@string/zen_mode_restrict_notifications_title"
android:icon="@drawable/ic_zen_mode_category_display" />
<SwitchPreferenceCompat
android:key="effect_greyscale"
android:title="@string/mode_grayscale_title"
android:summary="@string/mode_grayscale_summary"/>
android:summary="@string/mode_grayscale_summary"
android:icon="@drawable/ic_zen_mode_display_grayscale" />
<SwitchPreferenceCompat
android:key="effect_aod"
android:title="@string/mode_aod_title"
android:summary="@string/mode_aod_summary"/>
android:summary="@string/mode_aod_summary"
android:icon="@drawable/ic_zen_mode_display_aod" />
<SwitchPreferenceCompat
android:key="effect_wallpaper"
android:title="@string/mode_wallpaper_title"
android:summary="@string/mode_wallpaper_summary"/>
android:summary="@string/mode_wallpaper_summary"
android:icon="@drawable/ic_zen_mode_display_wallpaper" />
<SwitchPreferenceCompat
android:key="effect_dark_theme"
android:title="@string/mode_dark_theme_title"
android:summary="@string/mode_dark_theme_summary"/>
android:summary="@string/mode_dark_theme_summary"
android:icon="@drawable/ic_zen_mode_display_dark_theme" />
</PreferenceCategory>
</PreferenceScreen>

16
res/xml/modes_icon_picker.xml → res/xml/modes_edit_name_icon.xml
View File

@@ -18,20 +18,30 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="zen_mode_icon_picker_page"
android:key="zen_mode_edit_name_icon"
settings:searchable="false"
android:title="@string/zen_mode_icon_picker_title">
android:title="@string/zen_mode_rename_title">
<com.android.settingslib.widget.LayoutPreference
android:key="current_icon"
android:key="chosen_icon"
android:layout="@layout/settings_entity_header" />
<com.android.settings.applications.SpacePreference
android:layout_height="16dp" />
<com.android.settingslib.widget.LayoutPreference
android:key="name"
android:layout="@layout/modes_edit_name" />
<com.android.settings.applications.SpacePreference
android:layout_height="32dp" />
<com.android.settingslib.widget.LayoutPreference
android:key="icon_list"
android:selectable="false"
android:layout="@layout/modes_icon_list"/>
<com.android.settingslib.widget.LayoutPreference
android:key="done"
android:layout="@layout/modes_edit_done_button" />
</PreferenceScreen>

8
res/xml/modes_list_settings.xml
View File

@@ -18,13 +18,15 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/zen_modes_list_title">
android:title="@string/zen_modes_list_title"
android:key="modes_list_settings">
<!-- TODO: b/333682392 - add strings for summary as appropriate -->
<com.android.settingslib.widget.TopIntroPreference
android:title="@string/zen_modes_list_intro" />
<PreferenceCategory
android:key="zen_modes_list">
<!-- Preferences leading to rules are added in this PreferenceCategory. -->
<!-- Preferences leading to individual mode pages are added in this PreferenceCategory. -->
</PreferenceCategory>
<Preference

6
res/xml/modes_messages_settings.xml
View File

@@ -26,4 +26,10 @@
android:key="zen_mode_settings_category_messages"
android:title="@string/zen_mode_messages_header">
</PreferenceCategory>
<com.android.settingslib.widget.FooterPreference
android:key="info_footer"
android:title="@string/zen_mode_messages_footer"
android:selectable="false"
settings:searchable="false"/>
</PreferenceScreen>

13
res/xml/modes_people_settings.xml
View File

@@ -17,6 +17,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/zen_category_people" >
<!-- Calls & Messages -->
@@ -26,10 +27,18 @@
<Preference
android:key="zen_mode_people_messages"
android:title="@string/zen_mode_messages_title"/>
android:title="@string/zen_mode_messages_title"
android:icon="@drawable/ic_zen_mode_people_messages" />
<Preference
android:key="zen_mode_people_calls"
android:title="@string/zen_mode_calls_title"/>
android:title="@string/zen_mode_calls_title"
android:icon="@drawable/ic_zen_mode_people_calls" />
</PreferenceCategory>
<com.android.settingslib.widget.FooterPreference
android:key="info_footer"
android:title="@string/zen_mode_people_footer"
android:selectable="false"
settings:searchable="false"/>
</PreferenceScreen>

68
res/xml/modes_rule_settings.xml
View File

@@ -23,37 +23,59 @@
android:key="header"
android:layout="@layout/settings_entity_header" />
<com.android.settings.applications.SpacePreference
android:layout_height="16dp" />
<com.android.settings.notification.modes.ZenModeBlurbPreference
android:key="mode_blurb" />
<com.android.settings.applications.SpacePreference
android:layout_height="8dp" />
<com.android.settingslib.widget.LayoutPreference
android:key="activate"
android:selectable="false"
android:layout="@layout/modes_activation_button"/>
<com.android.settingslib.widget.ActionButtonsPreference
android:key="actions"
android:selectable="true" />
<PreferenceCategory
android:title="@string/mode_interruption_filter_title"
android:key="modes_filters">
<Preference
android:key="zen_mode_people"
android:title="@string/zen_category_people"/>
<Preference
android:key="zen_mode_apps"
android:title="@string/zen_category_apps" />
<Preference
android:key="zen_other_settings"
android:title="@string/zen_category_exceptions" />
</PreferenceCategory>
<com.android.settings.applications.SpacePreference
android:layout_height="16dp" />
<!-- automatic trigger section; preference changes programmatically depending on type -->
<PreferenceCategory
android:key="zen_automatic_trigger_category"
android:title="@string/zen_mode_automatic_trigger_title">
<!-- For configuring the trigger on tap and enabling/disabling the mode with the switch. -->
<com.android.settingslib.PrimarySwitchPreference
android:key="zen_automatic_trigger_settings" />
<!-- For adding a trigger for custom manual modes (no switch). -->
<Preference
android:key="zen_add_automatic_trigger"
android:title="@string/zen_mode_select_schedule"
android:icon="@drawable/ic_add_24dp" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/mode_interruption_filter_title"
android:key="modes_filters">
<SwitchPreferenceCompat
android:key="allow_all"
android:title="@string/zen_mode_allow_all_notifications"/>
<com.android.settings.notification.modes.CircularIconsPreference
android:key="zen_mode_people"
android:title="@string/zen_category_people"
android:icon="@drawable/ic_zen_mode_category_people" />
<com.android.settings.notification.modes.CircularIconsPreference
android:key="zen_mode_apps"
android:title="@string/zen_category_apps"
android:icon="@drawable/ic_zen_mode_category_apps" />
<com.android.settings.notification.modes.CircularIconsPreference
android:key="zen_other_settings"
android:title="@string/zen_category_exceptions"
android:icon="@drawable/ic_zen_mode_category_other" />
</PreferenceCategory>
<PreferenceCategory
@@ -61,6 +83,12 @@
android:key="modes_additional_actions">
<Preference
android:key="mode_display_settings"
android:title="@string/mode_display_settings_title" />
android:title="@string/mode_display_settings_title"
android:icon="@drawable/ic_zen_mode_category_display" />
<Preference
android:key="mode_manual_duration"
android:title="@string/zen_category_duration"
android:icon="@drawable/ic_zen_mode_category_duration" />
</PreferenceCategory>
</PreferenceScreen>

8
res/xml/modes_set_calendar.xml
View File

@@ -23,20 +23,18 @@
android:title="@string/zen_mode_set_calendar_title">
<PreferenceCategory
android:key="zen_mode_event_category"
android:title="@string/zen_mode_set_calendar_category_title">
android:key="zen_mode_event_category">
<!-- TODO: b/333682392 - use correct strings for below two prefs -->
<!-- During events for -->
<DropDownPreference
android:key="calendar"
android:title="@string/zen_mode_event_rule_calendar"
android:title="@string/zen_mode_set_calendar_which_calendar"
android:summary="%s" />
<!-- Where reply is -->
<DropDownPreference
android:key="reply"
android:title="@string/zen_mode_event_rule_reply"
android:title="@string/zen_mode_set_calendar_which_reply"
android:summary="%s" />
</PreferenceCategory>

2
res/xml/more_security_privacy_settings.xml
View File

@@ -92,7 +92,7 @@
"com.android.settings.sound.MediaControlsLockScreenPreferenceController" />
<!-- Allow software fallback for camera extensions -->
<SwitchPreference
<SwitchPreferenceCompat
android:key="privacy_camera_extensions_fallback"
android:title="@string/camera_extensions_fallback_title"
android:summary="@string/camera_extensions_fallback_description"

6
res/xml/network_provider_internet.xml
View File

@@ -29,7 +29,8 @@
android:order="-30"
settings:allowDividerAbove="true"
settings:keywords="@string/keywords_internet"
settings:useAdminDisabledSummary="true" />
settings:useAdminDisabledSummary="true"
settings:controller="com.android.settings.network.InternetPreferenceControllerV2" />
<com.android.settingslib.RestrictedPreference
android:key="calls_and_sms"
@@ -51,9 +52,8 @@
android:order="-15"
settings:keywords="@string/keywords_more_mobile_networks"
settings:userRestriction="no_config_mobile_networks"
settings:isPreferenceVisible="@bool/config_show_sim_info"
settings:useAdminDisabledSummary="true"
settings:searchable="@bool/config_show_sim_info"/>
settings:controller="com.android.settings.network.MobileNetworkSummaryController" />
<com.android.settingslib.RestrictedSwitchPreference
android:key="airplane_mode"

57
res/xml/physical_keyboard_a11y_settings.xml Normal file
View File

@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 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:title="@string/keyboard_a11y_settings"
android:key="physical_keyboard_a11y">
<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"
settings:controller="com.android.settings.inputmethod.KeyboardAccessibilityStickyKeysController"/>
<SwitchPreferenceCompat
android:key="accessibility_bounce_keys"
android:title="@string/bounce_keys"
android:defaultValue="false"
settings:controller="com.android.settings.inputmethod.KeyboardAccessibilityBounceKeysController"/>
<SwitchPreferenceCompat
android:key="accessibility_slow_keys"
android:title="@string/slow_keys"
android:defaultValue="false"
settings:controller="com.android.settings.inputmethod.KeyboardAccessibilitySlowKeysController" />
<SwitchPreferenceCompat
android:key="accessibility_mouse_keys"
android:title="@string/mouse_keys"
android:summary="@string/mouse_keys_summary"
android:defaultValue="false"
settings:controller="com.android.settings.inputmethod.KeyboardAccessibilityMouseKeysController" />
</PreferenceCategory>
</PreferenceScreen>

17
res/xml/physical_keyboard_settings.xml
View File

@@ -21,12 +21,6 @@
<PreferenceCategory
android:key="keyboard_options_category"
android:title="@string/keyboard_options_category">
<SwitchPreferenceCompat
android:key="show_virtual_keyboard_switch"
android:title="@string/show_ime"
android:summary="@string/show_ime_summary"
android:defaultValue="false" />
<Preference
android:key="keyboard_shortcuts_helper"
android:title="@string/keyboard_shortcuts_helper"
@@ -37,6 +31,11 @@
android:title="@string/modifier_keys_settings"
android:summary="@string/modifier_keys_settings_summary"
android:fragment="com.android.settings.inputmethod.ModifierKeysSettings" />
<Preference
android:key="physical_keyboard_a11y"
android:title="@string/keyboard_a11y_settings"
android:summary="@string/keyboard_a11y_settings_summary"
android:fragment="com.android.settings.inputmethod.PhysicalKeyboardA11yFragment" />
</PreferenceCategory>
<PreferenceCategory
@@ -59,5 +58,11 @@
android:title="@string/slow_keys"
android:defaultValue="false" />
<SwitchPreferenceCompat
android:key="accessibility_mouse_keys"
android:title="@string/mouse_keys"
android:summary="@string/mouse_keys_summary"
android:defaultValue="false" />
</PreferenceCategory>
</PreferenceScreen>

16
res/xml/polite_notifications_settings.xml
View File

@@ -17,20 +17,20 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/notification_polite_title">
<com.android.settingslib.widget.TopIntroPreference
android:key="polite_notification_desc"
android:title="@string/notification_polite_description"/>
<!-- TODO(b/330606963): add the illustration back when animation is ready-->
<!-- <com.android.settingslib.widget.IllustrationPreference-->
<!-- android:key="bubbles_illustration"-->
<!-- settings:searchable="false"-->
<!-- android:selectable="false"-->
<!-- app:lottie_rawRes="@raw/lottie_bubbles"-->
<!-- app:lottie_cacheComposition="false"-->
<!-- settings:dynamicColor="true" />-->
<com.android.settingslib.widget.IllustrationPreference
android:key="notification_cooldown_illustration"
settings:searchable="false"
android:selectable="false"
app:lottie_rawRes="@raw/lottie_notification_cooldown"
app:lottie_cacheComposition="false"
settings:dynamicColor="true"/>
<com.android.settingslib.widget.MainSwitchPreference
android:key="polite_notification_global_pref"

6
res/xml/power_usage_advanced.xml
View File

@@ -23,11 +23,12 @@
<PreferenceCategory
android:key="battery_tips_category"
android:layout="@layout/preference_category_no_label"
settings:controller=
"com.android.settings.fuelgauge.batteryusage.BatteryTipsController"
settings:isPreferenceVisible="false">
<com.android.settings.fuelgauge.batteryusage.BatteryTipsCardPreference
<com.android.settings.widget.TipCardPreference
android:key="battery_tips_card"
settings:isPreferenceVisible="false" />
@@ -56,12 +57,13 @@
"com.android.settings.fuelgauge.batteryusage.BatteryUsageBreakdownController"
settings:isPreferenceVisible="false">
<com.android.settings.fuelgauge.batteryusage.SpinnerPreference
<com.android.settingslib.widget.SettingsSpinnerPreference
android:key="battery_usage_spinner"
settings:isPreferenceVisible="false" />
<PreferenceCategory
android:key="app_list"
android:layout="@layout/preference_category_no_label"
settings:isPreferenceVisible="false" />
<com.android.settingslib.widget.FooterPreference

7
res/xml/private_space_hide_locked.xml
View File

@@ -21,7 +21,8 @@
<com.android.settingslib.widget.IllustrationPreference
android:key="private_space_hide_illustration"
settings:searchable="false"
settings:lottie_rawRes="@raw/private_space_hide_when_locked_illustration"/>
settings:lottie_rawRes="@raw/private_space_hide_when_locked_illustration"
settings:controller="com.android.settings.privatespace.HidePrivateSpaceIllustrationController"/>
<com.android.settingslib.widget.MainSwitchPreference
android:key="hide_when_locked"
@@ -35,7 +36,9 @@
settings:searchable="false" />
<PreferenceCategory
android:title="@string/private_space_access_header">
android:key="private_space_access"
android:title="@string/private_space_access_header"
settings:controller="com.android.settings.privatespace.HidePrivateSpaceCategoryController">
<Preference
android:key="search_when_locked_footer"

3
res/xml/regional_preference_main_page.xml
View File

@@ -16,7 +16,8 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/regional_preferences_title">
android:title="@string/regional_preferences_title"
android:key="regional_preferences">
<com.android.settingslib.widget.TopIntroPreference
android:title="@string/regional_preferences_main_page_sub_title"

4
res/xml/regional_preference_numbering_system_page.xml
View File

@@ -13,4 +13,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" />
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
android:key="regional_preference_numbering_system"/>

3
res/xml/regional_preferences_first_day_of_week.xml
View File

@@ -17,7 +17,8 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/first_day_of_week_preferences_title">
android:title="@string/first_day_of_week_preferences_title"
android:key="regional_preference_first_day_of_week">
<com.android.settingslib.widget.TopIntroPreference
android:title="@string/regional_preferences_option_page_sub_title"

3
res/xml/regional_preferences_temperature.xml
View File

@@ -17,7 +17,8 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/temperature_preferences_title">
android:title="@string/temperature_preferences_title"
android:key="regional_preference_temperature">
<com.android.settingslib.widget.TopIntroPreference
android:title="@string/regional_preferences_option_page_sub_title"

8
res/xml/security_advanced_settings.xml
View File

@@ -140,13 +140,13 @@
settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />
<com.android.settingslib.RestrictedPreference
android:key="fingerprint_settings_profile"
android:title="@string/security_settings_work_fingerprint_preference_title"
android:key="face_settings_profile"
android:title="@string/security_settings_face_profile_preference_title"
android:summary="@string/summary_placeholder" />
<com.android.settingslib.RestrictedPreference
android:key="face_settings_profile"
android:title="@string/security_settings_face_profile_preference_title"
android:key="fingerprint_settings_profile"
android:title="@string/security_settings_work_fingerprint_preference_title"
android:summary="@string/summary_placeholder" />
<com.android.settingslib.RestrictedPreference

14
res/xml/security_settings_combined_biometric_profile.xml
View File

@@ -26,13 +26,6 @@
android:key="biometric_ways_to_unlock"
android:title="@string/biometric_settings_category_ways_to_unlock">
<com.android.settingslib.RestrictedPreference
android:key="biometric_fingerprint_settings_profile"
android:title="@string/security_settings_work_fingerprint_preference_title"
android:summary="@string/summary_placeholder"
settings:keywords="@string/keywords_fingerprint_settings"
settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintProfileStatusPreferenceController" />
<com.android.settingslib.RestrictedPreference
android:key="biometric_face_settings_profile"
android:title="@string/security_settings_face_profile_preference_title"
@@ -40,6 +33,13 @@
settings:keywords="@string/keywords_face_settings"
settings:controller="com.android.settings.biometrics.combination.BiometricFaceProfileStatusPreferenceController" />
<com.android.settingslib.RestrictedPreference
android:key="biometric_fingerprint_settings_profile"
android:title="@string/security_settings_work_fingerprint_preference_title"
android:summary="@string/summary_placeholder"
settings:keywords="@string/keywords_fingerprint_settings"
settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintProfileStatusPreferenceController" />
</PreferenceCategory>
<PreferenceCategory

3
res/xml/security_settings_fingerprint_limbo.xml
View File

@@ -18,7 +18,8 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/security_settings_fingerprint_preference_title">
android:title="@string/security_settings_fingerprint_preference_title"
settings:searchable="false">
<PreferenceCategory
android:key="security_settings_fingerprints_enrolled"

2
res/xml/system_dashboard_fragment.xml
View File

@@ -39,7 +39,7 @@
<Preference
android:key="trackpad_settings"
android:title="@string/trackpad_settings"
android:title="@string/trackpad_mouse_settings"
android:summary="@string/trackpad_settings_summary"
android:icon="@drawable/ic_settings_trackpad"
android:order="-254"

3
res/xml/terms_of_address.xml
View File

@@ -17,7 +17,8 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/terms_of_address_title">
android:title="@string/terms_of_address_title"
android:key="terms_of_address">
<com.android.settingslib.widget.TopIntroPreference
android:title="@string/terms_of_address_intro_title"

15
res/xml/top_level_settings.xml
View File

@@ -68,6 +68,16 @@
android:summary="@string/notification_dashboard_summary"
settings:highlightableMenuKey="@string/menu_key_notifications"/>
<com.android.settings.widget.RestrictedHomepagePreference
android:fragment="com.android.settings.notification.modes.ZenModesListFragment"
android:icon="@*android:drawable/ic_zen_priority_modes"
android:key="top_level_priority_modes"
android:order="-115"
android:title="@string/zen_modes_list_title"
settings:useAdminDisabledSummary="true"
settings:highlightableMenuKey="@string/menu_key_priority_modes"
settings:controller="com.android.settings.notification.modes.ZenModesLinkPreferenceController"/>
<com.android.settings.widget.HomepagePreference
android:fragment="com.android.settings.fuelgauge.batteryusage.PowerUsageSummary"
android:icon="@drawable/ic_settings_battery_white"
@@ -94,8 +104,9 @@
android:key="top_level_sound"
android:order="-90"
android:title="@string/sound_settings"
android:summary="@string/sound_dashboard_summary"
settings:highlightableMenuKey="@string/menu_key_sound"/>
android:summary="@string/sound_dashboard_summary_with_dnd"
settings:highlightableMenuKey="@string/menu_key_sound"
settings:controller="com.android.settings.sound.TopLevelSoundPreferenceController"/>
<com.android.settings.widget.HomepagePreference
android:fragment="com.android.settings.DisplaySettings"

15
res/xml/top_level_settings_v2.xml
View File

@@ -79,8 +79,19 @@
android:key="top_level_sound"
android:order="-40"
android:title="@string/sound_settings"
android:summary="@string/sound_dashboard_summary"
settings:highlightableMenuKey="@string/menu_key_sound"/>
android:summary="@string/sound_dashboard_summary_with_dnd"
settings:highlightableMenuKey="@string/menu_key_sound"
settings:controller="com.android.settings.sound.TopLevelSoundPreferenceController"/>
<com.android.settings.widget.RestrictedHomepagePreference
android:fragment="com.android.settings.notification.modes.ZenModesListFragment"
android:icon="@*android:drawable/ic_zen_priority_modes"
android:key="top_level_priority_modes"
android:order="-35"
android:title="@string/zen_modes_list_title"
settings:useAdminDisabledSummary="true"
settings:highlightableMenuKey="@string/menu_key_priority_modes"
settings:controller="com.android.settings.notification.modes.ZenModesLinkPreferenceController"/>
<com.android.settings.widget.HomepagePreference
android:fragment="com.android.settings.communal.CommunalDashboardFragment"

14
res/xml/trackpad_settings.xml
View File

@@ -18,7 +18,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/trackpad_settings">
android:title="@string/trackpad_mouse_settings">
<Preference
android:key="trackpad_gesture_settings"
android:title="@string/trackpad_touchpad_gesture_title"
@@ -62,12 +62,14 @@
android:selectable="false"
settings:controller="com.android.settings.inputmethod.TrackpadPointerSpeedPreferenceController"/>
<com.android.settings.inputmethod.PointerFillStylePreference
android:key="pointer_fill_style"
android:title="@string/pointer_fill_style"
<Preference
android:fragment="com.android.settings.inputmethod.PointerTouchpadFragment"
android:key="pointer_and_touchpad"
android:order="50"
android:dialogTitle="@string/pointer_fill_style"
settings:controller="com.android.settings.inputmethod.PointerFillStylePreferenceController"/>
android:persistent="false"
android:title="@string/accessibility_pointer_and_touchpad_title"
android:summary="@string/accessibility_pointer_and_touchpad_summary"
settings:searchable="true"/>
<com.android.settingslib.widget.ButtonPreference
android:key="trackpad_touch_gesture"

5
res/xml/wifi_network_details_fragment2.xml
View File

@@ -35,6 +35,11 @@
android:icon="@drawable/ic_info_outline_24dp"
android:selectable="false"/>
<com.android.settingslib.widget.BannerMessagePreference
android:key="wep_less_secure_warning"
android:title="@string/wep_network_less_secure_warning_title"
settings:controller="com.android.settings.wifi.WepLessSecureWarningController"/>
<!-- Buttons -->
<com.android.settingslib.widget.ActionButtonsPreference
android:key="buttons"

5
res/xml/zen_mode_apps_settings.xml
View File

@@ -34,11 +34,6 @@
android:title="@string/zen_mode_apps_none_apps"
settings:searchable="false"/>
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="zen_mode_apps_all"
android:title="@string/zen_mode_apps_all_apps"
settings:searchable="false"/>
</PreferenceCategory>
</PreferenceScreen>