Move safety & regulatory manual closer to legal settings

Bug: 113788849
Test: visual
Change-Id: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
Merged-In: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
(cherry picked from commit f5ccd33567)
This commit is contained in:
Fan Zhang
2018-09-06 12:21:30 -07:00
committed by android-build-team Robot
parent aa58fc861a
commit 3dba0abc61

View File

@@ -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>
</PreferenceScreen>