commit f5ccd335672ce751cfa5e84fee8c158c0d0ca833
author Fan Zhang <zhfan@google.com> Thu Sep 06 12:21:30 2018 -0700
committer Fan Zhang <zhfan@google.com> Thu Sep 06 22:50:32 2018 +0000
tree 86ae78318052588fc38f4c644e148201513fd0c1
parent 94fdfc4a449e4347076cf22679e8dcf61ab3f76c

Move safety & regulatory manual closer to legal settings

Bug: 113788849
Test: visual
Change-Id: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
Merged-In: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386

res/xml/my_device_info.xml

diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index 3dac8b8..3d499ab 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -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"
@@ -166,4 +166,4 @@
         android:summary="@string/summary_placeholder"
         settings:allowDividerAbove="true"/>
 
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>