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

Commit d8264e37 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move safety & regulatory manual closer to legal settings"

parents 7644285c cf8aa5ce
Loading
Loading
Loading
Loading
+9 −9
Original line number Diff line number Diff line
@@ -72,10 +72,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"
@@ -142,14 +150,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"