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

Commit e0908da4 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [4963114, 4963471, 4963115, 4962921, 4963491] into pi-qpr1-release 

Change-Id: Icbb8916d8a497c8507844f55bca7677958ee6f81
parents aa58fc86 3dba0abc

res/xml/my_device_info.xml

+10 −10
Original line number Diff line number Diff line
@@ -71,10 +71,18 @@ 
        <intent android:action="android.settings.SHOW_REGULATORY_INFO"/>

    </Preference>



    <!-- Safety & regulatory manual -->

    <Preference

        android:key="safety_info"

        android:order="7"

        android:title="@string/safety_and_regulatory_info">

        <intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/>

    </Preference>



    <!-- SIM status -->

    <Preference

        android:key="sim_status"

        android:order="7"

        android:order="8"

        android:title="@string/sim_status_title"

        settings:keywords="@string/keywords_sim_status"

        android:summary="@string/summary_placeholder"
@@ -129,14 +137,6 @@ 
        android:summary="@string/summary_placeholder"

        android:selectable="false"/>



    <!-- Safety & regulatory manual -->

    <Preference

        android:key="safety_info"

        android:order="39"

        android:title="@string/safety_and_regulatory_info">

        <intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/>

    </Preference>



    <!-- Manual -->

    <Preference

        android:key="manual"