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

Commit d9d9d701 authored by Yanting Yang's avatar Yanting Yang Committed by Android (Google) Code Review
Browse files

Merge "Apply FooterPreference to the sub-pages of Special app access" into sc-dev

parents 36999b5d 3e9e90aa

res/xml/app_ops_permissions_details.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    <com.android.settings.widget.FilterTouchesSwitchPreference

        android:key="app_ops_settings_switch" />



    <Preference

    <com.android.settingslib.widget.FooterPreference

        android:key="app_ops_settings_description"

        android:selectable="false" />

res/xml/change_wifi_state_details.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ 
      android:key="app_ops_settings_switch"

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



  <Preference

  <com.android.settingslib.widget.FooterPreference

      android:key="app_ops_settings_preference"

      android:summary="@string/change_wifi_state_app_detail_summary"

      android:title="@string/change_wifi_state_app_detail_summary"

      android:selectable="false"/>



</PreferenceScreen>

res/xml/draw_overlay_permissions_details.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
        android:key="app_ops_settings_switch"

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



    <Preference

        android:summary="@string/allow_overlay_description"

    <com.android.settingslib.widget.FooterPreference

        android:title="@string/allow_overlay_description"

        android:selectable="false"/>



</PreferenceScreen>

res/xml/external_sources_details.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ 
        android:key="external_sources_settings_switch"

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



    <Preference

    <com.android.settingslib.widget.FooterPreference

        android:key="external_sources_settings_description"

        android:summary="@string/install_all_warning"

        android:title="@string/install_all_warning"

        android:selectable="false" />



</PreferenceScreen>

res/xml/picture_in_picture_permissions_details.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
        android:key="app_ops_settings_switch"

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



    <Preference

        android:summary="@string/picture_in_picture_app_detail_summary"

    <com.android.settingslib.widget.FooterPreference

        android:title="@string/picture_in_picture_app_detail_summary"

        android:selectable="false"/>



</PreferenceScreen>