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

Commit d735f982 authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge "Move safety & regulatory manual closer to legal settings" into pi-dev 

am: f81ec880

Change-Id: I7156cd60aed8ee1a8d439c6e1504df0b578a0ff3
parents 04e48eae f81ec880

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"