commit d8264e373fd4c766c6fe0fb931b947e6760596c2
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Sep 06 21:52:34 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 06 21:52:34 2018 +0000
tree 10d23d0fc0e87a3b2a79c1808abce62715e56a90
parent 7644285c2cc4cab8a20ed48f713e147ef3c8b951
parent cf8aa5ce3ff19813ac5a1e2da6646c415dd74aba

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

res/xml/my_device_info.xml

diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index 957ba81..535f61a 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -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"