Merge "Add a few pages to search index."
This commit is contained in:
committed by
Android (Google) Code Review
commit
7adfcf6819
@@ -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"
|
||||
|
@@ -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>
|
||||
|
@@ -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" />
|
||||
|
@@ -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" />
|
||||
|
@@ -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"
|
||||
|
@@ -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>
|
||||
|
@@ -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" />
|
||||
|
Reference in New Issue
Block a user