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

Commit 60ba7361 authored by Jacky Wang's avatar Jacky Wang Committed by Android (Google) Code Review
Browse files

Merge "[Catalyst] Clean up redundant android:persistent/selectable" into main

parents bd8546ed d63b2be9

res/xml/accessibility_button_settings.xml

+0 −2
Original line number Diff line number Diff line
@@ -19,13 +19,11 @@ 


    <com.android.settingslib.widget.TopIntroPreference

        android:key="accessibility_button_intro"

        android:persistent="false"

        android:title="@string/accessibility_button_intro_text"

        settings:searchable="false" />



    <com.android.settingslib.widget.IllustrationPreference

        android:key="accessibility_button_preview"

        android:persistent="false"

        android:selectable="false"

        settings:controller="com.android.settings.accessibility.AccessibilityButtonPreviewPreferenceController"

        settings:searchable="false" />

res/xml/accessibility_edit_shortcuts.xml

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 


    <com.android.settingslib.widget.TopIntroPreference

        android:key="@string/accessibility_shortcut_description_pref"

        android:persistent="false"

        android:selectable="false"

        settings:allowDividerAbove="false"

        settings:allowDividerBelow="false"/>

    <!-- LINT.IfChange(shortcut_type_ui_order) -->

res/xml/add_account_settings.xml

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 


    <com.android.settingslib.widget.FooterPreference

        android:key="add_account_enterprise_disclosure_footer"

        android:selectable="false"

        settings:searchable="false"

        settings:controller="com.android.settings.accounts.EnterpriseDisclosurePreferenceController"/>

</PreferenceScreen>

res/xml/alarms_and_reminders.xml

+1 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 


    <com.android.settingslib.widget.FooterPreference

        android:key="alarms_and_reminders_description"

        android:title="@string/alarms_and_reminders_footer_title"

        android:selectable="false" />

        android:title="@string/alarms_and_reminders_footer_title" />



</PreferenceScreen>

res/xml/app_language_picker.xml

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

        android:title="@string/desc_no_available_supported_locale"

        android:order="3"

        android:selectable="false"

        settings:isPreferenceVisible="false"

        settings:searchable="false"/>