Add a few pages to search index.
- Data saver
- A few special permission access pages
- Picture-in-picture
- Premium sms
- do not disturb access
- And a unrelated cleanup: move EmptyTextFragment from
notification/ to widget/
Bug: 70720645
Test: robotests
Change-Id: I6a87f712bf81f9fd32fa9a3826fba851ca748409
diff --git a/res/xml/app_info_settings.xml b/res/xml/app_info_settings.xml
index 15afb5f..9d77e86 100644
--- a/res/xml/app_info_settings.xml
+++ b/res/xml/app_info_settings.xml
@@ -138,7 +138,7 @@
android:key="picture_in_picture"
android:title="@string/picture_in_picture_app_detail_title"
android:summary="@string/summary_placeholder"
- settings:controller="com.android.settings.applications.appinfo.PictureInPictureDetailPreferenceController" />
+ settings:controller="com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetailPreferenceController" />
<Preference
android:key="install_other_apps"
diff --git a/res/xml/data_saver.xml b/res/xml/data_saver.xml
index 76715bb..19944e2 100644
--- a/res/xml/data_saver.xml
+++ b/res/xml/data_saver.xml
@@ -14,13 +14,17 @@
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/data_saver_title">
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="data_saver_screen"
+ android:title="@string/data_saver_title">
<Preference
android:key="unrestricted_access"
android:title="@string/unrestricted_data_saver"
android:summary="@string/summary_two_lines_placeholder"
- android:fragment="com.android.settings.datausage.UnrestrictedDataAccess" />
+ android:fragment="com.android.settings.datausage.UnrestrictedDataAccess"
+ settings:controller="com.android.settings.applications.specialaccess.DataSaverController" />
</PreferenceScreen>
diff --git a/res/xml/picture_in_picture_settings.xml b/res/xml/picture_in_picture_settings.xml
index b7091df..35839cd 100644
--- a/res/xml/picture_in_picture_settings.xml
+++ b/res/xml/picture_in_picture_settings.xml
@@ -17,4 +17,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/picture_in_picture_title" />
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="picture_in_picture_screen"
+ android:title="@string/picture_in_picture_title"
+ settings:controller="com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureScreenPreferenceController" />
diff --git a/res/xml/premium_sms_settings.xml b/res/xml/premium_sms_settings.xml
index 7bcf11e..17d1297 100644
--- a/res/xml/premium_sms_settings.xml
+++ b/res/xml/premium_sms_settings.xml
@@ -17,4 +17,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/premium_sms_access" />
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="premium_sms_screen"
+ android:title="@string/premium_sms_access"
+ settings:controller="com.android.settings.applications.specialaccess.premiumsms.PremiumSmsScreenPreferenceController" />
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index 574686a..552f0fc 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -73,15 +73,15 @@
<Preference
android:key="picture_in_picture"
android:title="@string/picture_in_picture_title"
- android:fragment="com.android.settings.applications.appinfo.PictureInPictureSettings"
+ android:fragment="com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureSettings"
settings:keywords="@string/picture_in_picture_keywords"
- settings:controller="com.android.settings.applications.specialaccess.PictureInPictureController" />
+ settings:controller="com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureController" />
<Preference
android:key="premium_sms"
android:title="@string/premium_sms_access"
- android:fragment="com.android.settings.applications.PremiumSmsAccess"
- settings:controller="com.android.settings.applications.specialaccess.PremiumSmsController" />
+ android:fragment="com.android.settings.applications.specialaccess.premiumsms.PremiumSmsAccess"
+ settings:controller="com.android.settings.applications.specialaccess.premiumsms.PremiumSmsController" />
<Preference
android:key="data_saver"
diff --git a/res/xml/unrestricted_data_access_settings.xml b/res/xml/unrestricted_data_access_settings.xml
index b1abb8e..a386d1b 100644
--- a/res/xml/unrestricted_data_access_settings.xml
+++ b/res/xml/unrestricted_data_access_settings.xml
@@ -18,7 +18,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:key="unrestricted_data"
+ android:key="unrestricted_data_screen"
android:title="@string/unrestricted_data_saver"
settings:controller="com.android.settings.datausage.UnrestrictedDataAccessPreferenceController">
</PreferenceScreen>
diff --git a/res/xml/zen_access_settings.xml b/res/xml/zen_access_settings.xml
index 35cfdb8..48dc1af 100644
--- a/res/xml/zen_access_settings.xml
+++ b/res/xml/zen_access_settings.xml
@@ -17,4 +17,5 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
+ android:key="zen_access_screen"
android:title="@string/manage_zen_access_title" />