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

Merge "Update settings PrimarySwitchPreference reference"

Browse Source
This commit is contained in:
Wilson Wu
2021-09-07 02:51:20 +00:00
committed by Android (Google) Code Review
parent eb969df581 9edf79741d
commit 395e839b10
36 changed files with 37 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
res/layout/restricted_preference_widget_primary_switch.xml
View File

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2019 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.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<include layout="@layout/restricted_icon"/>
<include layout="@layout/preference_widget_primary_switch"/>
</merge>

2
res/xml/accessibility_settings.xml
View File

@@ -44,7 +44,7 @@
android:title="@string/accessibility_text_and_display_title"
settings:searchable="true"/>
<com.android.settings.widget.PrimarySwitchPreference
<com.android.settingslib.PrimarySwitchPreference
android:fragment="com.android.settings.accessibility.ToggleReduceBrightColorsPreferenceFragment"
android:key="reduce_bright_colors_preference"
android:icon="@drawable/ic_reduce_bright_colors"

2
res/xml/development_settings.xml
View File

@@ -137,7 +137,7 @@
<Preference android:key="clear_adb_keys"
android:title="@string/clear_adb_keys" />
<com.android.settings.widget.PrimarySwitchPreference
<com.android.settingslib.PrimarySwitchPreference
android:fragment="com.android.settings.development.WirelessDebuggingFragment"
android:key="toggle_adb_wireless"
android:title="@string/enable_adb_wireless"

4
res/xml/display_settings.xml
View File

@@ -31,7 +31,7 @@
settings:useAdminDisabledSummary="true"
settings:userRestriction="no_config_brightness"/>
<com.android.settings.widget.PrimarySwitchPreference
<com.android.settingslib.PrimarySwitchPreference
android:key="auto_brightness_entry"
android:title="@string/auto_brightness_title"
android:fragment="com.android.settings.display.AutoBrightnessSettings"
@@ -85,7 +85,7 @@
<PreferenceCategory
android:title="@string/category_name_color">
<com.android.settings.widget.PrimarySwitchPreference
<com.android.settingslib.PrimarySwitchPreference
android:key="night_display"
android:title="@string/night_display_title"
android:fragment="com.android.settings.display.NightDisplaySettings"

2
res/xml/gestures.xml
View File

@@ -87,7 +87,7 @@
android:fragment="com.android.settings.gestures.PowerMenuSettings"
settings:controller="com.android.settings.gestures.PowerMenuPreferenceController" />
<com.android.settings.widget.PrimarySwitchPreference
<com.android.settingslib.PrimarySwitchPreference
android:key="gesture_prevent_ringing_summary"
android:title="@string/gesture_prevent_ringing_screen_title"
android:fragment="com.android.settings.gestures.PreventRingingGestureSettings"

6
res/xml/network_and_internet.xml
View File

@@ -28,7 +28,7 @@
android:order="-40"
settings:controller="com.android.settings.network.MultiNetworkHeaderController"/>
<com.android.settings.widget.PrimarySwitchPreference
<com.android.settingslib.PrimarySwitchPreference
android:fragment="com.android.settings.wifi.WifiSettings"
android:key="main_toggle_wifi"
android:title="@string/wifi_settings"
@@ -39,7 +39,7 @@
<intent
android:action="android.settings.WIFI_SETTINGS"
android:targetClass="Settings$WifiSettingsActivity" />
</com.android.settings.widget.PrimarySwitchPreference>
</com.android.settingslib.PrimarySwitchPreference>
<com.android.settings.widget.AddPreference
android:key="mobile_network_list"
@@ -79,7 +79,7 @@
settings:userRestriction="no_config_tethering"
settings:useAdminDisabledSummary="true" />
<com.android.settings.widget.PrimarySwitchPreference
<com.android.settingslib.PrimarySwitchPreference
android:fragment="com.android.settings.AllInOneTetherSettings"
android:key="all_tether_settings"
android:title="@string/tether_settings_title_all"

2
res/xml/network_provider_internet.xml
View File

@@ -79,7 +79,7 @@
settings:userRestriction="no_config_tethering"
settings:useAdminDisabledSummary="true" />
<com.android.settings.widget.PrimarySwitchPreference
<com.android.settingslib.PrimarySwitchPreference
android:fragment="com.android.settings.AllInOneTetherSettings"
android:key="all_tether_settings"
android:title="@string/tether_settings_title_all"

5
res/xml/privacy_dashboard_settings.xml
View File

@@ -128,12 +128,11 @@
android:summary="@string/content_capture_summary"
settings:controller="com.android.settings.privacy.EnableContentCapturePreferenceController"/>
<com.android.settings.widget.PrimarySwitchPreference
<com.android.settingslib.PrimarySwitchPreference
android:key="content_capture_custom_settings"
android:title="@string/content_capture"
android:summary="@string/content_capture_summary"
settings:controller="com.android.settings.privacy.EnableContentCaptureWithServiceSettingsPreferenceController">
</com.android.settings.widget.PrimarySwitchPreference>
settings:controller="com.android.settings.privacy.EnableContentCaptureWithServiceSettingsPreferenceController"/>
<!-- Clipboard access notifications -->
<SwitchPreference

2
res/xml/sound_settings.xml
View File

@@ -128,7 +128,7 @@
settings:controller="com.android.settings.sound.VibrateForCallsPreferenceController"
settings:keywords="@string/keywords_vibrate_for_calls"/>
<com.android.settings.widget.PrimarySwitchPreference
<com.android.settingslib.PrimarySwitchPreference
android:key="gesture_prevent_ringing_sound"
android:title="@string/gesture_prevent_ringing_sound_title"
android:order="-80"

2
res/xml/storage_dashboard_fragment.xml
View File

@@ -31,7 +31,7 @@
android:selectable="false"
settings:searchable="false"
settings:controller="com.android.settings.deviceinfo.storage.StorageUsageProgressBarPreferenceController"/>
<com.android.settings.widget.PrimarySwitchPreference
<com.android.settingslib.PrimarySwitchPreference
android:fragment="com.android.settings.deletionhelper.AutomaticStorageManagerSettings"
android:key="toggle_asm"
android:title="@string/automatic_storage_manager_preference_title"

2
res/xml/storage_dashboard_header_fragment.xml
View File

@@ -30,7 +30,7 @@ Copyright (C) 2021 The Android Open Source Project
android:selectable="false"
settings:searchable="false"
settings:controller="com.android.settings.deviceinfo.storage.StorageUsageProgressBarPreferenceController"/>
<com.android.settings.widget.PrimarySwitchPreference
<com.android.settingslib.PrimarySwitchPreference
android:fragment="com.android.settings.deletionhelper.AutomaticStorageManagerSettings"
android:key="toggle_asm"
android:title="@string/automatic_storage_manager_preference_title"