Update settings PrimarySwitchPreference reference
To make InputMethodPreference support 2 target
reference, CL[1] move the PrimarySwitchPreference
into SettingsLib.
Change all PrimarySwitchPreference reference to
Settingslib one and remove the original one.
[1]: Idea3935d95b8d22b00ca89313e9eb3e979e4aa74
Bug: 197705032
Test: Presubmit
Change-Id: I95d111522344bb7cbdd380382e48fe60a5ebc9a2
diff --git a/res/layout/restricted_preference_widget_primary_switch.xml b/res/layout/restricted_preference_widget_primary_switch.xml
deleted file mode 100644
index 81d7291..0000000
--- a/res/layout/restricted_preference_widget_primary_switch.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 14879a8..61f527d 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -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"
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 115fefc..603bab3 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -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"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index c48dcbc..328e15c 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -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"
diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml
index f4e21fa..4881360 100644
--- a/res/xml/gestures.xml
+++ b/res/xml/gestures.xml
@@ -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"
diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
index 7b6b67c..bf4d1da 100644
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -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"
diff --git a/res/xml/network_provider_internet.xml b/res/xml/network_provider_internet.xml
index 1a5378e..07e797a 100644
--- a/res/xml/network_provider_internet.xml
+++ b/res/xml/network_provider_internet.xml
@@ -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"
diff --git a/res/xml/privacy_dashboard_settings.xml b/res/xml/privacy_dashboard_settings.xml
index f4e7062..236df5e 100644
--- a/res/xml/privacy_dashboard_settings.xml
+++ b/res/xml/privacy_dashboard_settings.xml
@@ -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
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 56632a5..0468e7f 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -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"
diff --git a/res/xml/storage_dashboard_fragment.xml b/res/xml/storage_dashboard_fragment.xml
index 8edf4bf..9c0f1d1 100644
--- a/res/xml/storage_dashboard_fragment.xml
+++ b/res/xml/storage_dashboard_fragment.xml
@@ -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"
diff --git a/res/xml/storage_dashboard_header_fragment.xml b/res/xml/storage_dashboard_header_fragment.xml
index 60c4c88..7445f9f 100644
--- a/res/xml/storage_dashboard_header_fragment.xml
+++ b/res/xml/storage_dashboard_header_fragment.xml
@@ -30,7 +30,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"