Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7adfcf68 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add a few pages to search index."

parents 44c06811 4560ab7a

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -2438,7 +2438,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.applications.appinfo.PictureInPictureSettings" />

                android:value="com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureSettings" />

        </activity>



        <activity
@@ -2452,7 +2452,7 @@ 
                <data android:scheme="package" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.applications.appinfo.PictureInPictureDetails" />

                android:value="com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetails" />

        </activity>



        <activity

res/xml/app_info_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

res/xml/data_saver.xml

+7 −3
Original line number Diff line number Diff line
@@ -14,13 +14,17 @@ 
     limitations under the License.

-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

<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>

res/xml/picture_in_picture_settings.xml

+4 −1
Original line number Diff line number Diff line
@@ -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" />

res/xml/premium_sms_settings.xml

+4 −1
Original line number Diff line number Diff line
@@ -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" />