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

Commit f61673d7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Remove duplicated index search data" into rvc-dev am: ed39b5bb am:... 

Merge "Remove duplicated index search data" into rvc-dev am: ed39b5bb am: 90d0060f am: 6ecf256a am: f25b2550

Change-Id: I9f81da0c934113800d84f9bd12ca0604209654c2
parents 25bbabe0 f25b2550

res/xml/accessibility_settings.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -139,6 +139,7 @@ 
            android:key="gesture_system_navigation_input_summary_accessibility"

            android:key="gesture_system_navigation_input_summary_accessibility"

            android:persistent="false"

            android:persistent="false"

            android:title="@string/system_navigation_title"

            android:title="@string/system_navigation_title"

            settings:searchable="false"

            settings:controller="com.android.settings.gestures.SystemNavigationPreferenceController"/>

            settings:controller="com.android.settings.gestures.SystemNavigationPreferenceController"/>





    </PreferenceCategory>

    </PreferenceCategory>

res/xml/billing_cycle.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
<PreferenceScreen

<PreferenceScreen

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

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

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:key="billing_cycle_settings"

    android:title="@string/billing_cycle">

    android:title="@string/billing_cycle">





    <Preference

    <Preference

res/xml/bluetooth_screen.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ 
        settings:allowDividerAbove="true"

        settings:allowDividerAbove="true"

        settings:userRestriction="no_config_bluetooth"

        settings:userRestriction="no_config_bluetooth"

        settings:useAdminDisabledSummary="true"

        settings:useAdminDisabledSummary="true"

        settings:searchable="false"

        settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"/>

        settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"/>





    <com.android.settingslib.widget.FooterPreference

    <com.android.settingslib.widget.FooterPreference

res/xml/configure_notification_settings.xml

+4 −2
Original line number Original line Diff line number Diff line
@@ -42,7 +42,8 @@ 
            android:key="all_notifications"

            android:key="all_notifications"

            android:title="@string/notifications_title"

            android:title="@string/notifications_title"

            android:fragment="com.android.settings.applications.manageapplications.ManageApplications"

            android:fragment="com.android.settings.applications.manageapplications.ManageApplications"

            android:order="4">

            android:order="4"

            settings:searchable="false">

            <extra

            <extra

                android:name="classname"

                android:name="classname"

                android:value="com.android.settings.Settings$NotificationAppListActivity"/>

                android:value="com.android.settings.Settings$NotificationAppListActivity"/>
@@ -136,7 +137,8 @@ 
            android:title="@string/notification_ringtone_title"

            android:title="@string/notification_ringtone_title"

            android:dialogTitle="@string/notification_ringtone_title"

            android:dialogTitle="@string/notification_ringtone_title"

            android:summary="@string/summary_placeholder"

            android:summary="@string/summary_placeholder"

            android:ringtoneType="notification"/>

            android:ringtoneType="notification"

            settings:searchable="false"/>





        <SwitchPreference

        <SwitchPreference

            android:key="notification_people_strip"

            android:key="notification_people_strip"

res/xml/connected_devices_advanced.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ 
        android:title="@string/nfc_quick_toggle_title"

        android:title="@string/nfc_quick_toggle_title"

        android:icon="@drawable/ic_nfc"

        android:icon="@drawable/ic_nfc"

        android:order="-7"

        android:order="-7"

        settings:searchable="false"

        settings:controller="com.android.settings.connecteddevice.NfcAndPaymentFragmentController"/>

        settings:controller="com.android.settings.connecteddevice.NfcAndPaymentFragmentController"/>





    <Preference

    <Preference