PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: f81ec88024

Change-Id: I7156cd60aed8ee1a8d439c6e1504df0b578a0ff3
This commit is contained in:
Fan Zhang
2018-09-06 18:33:30 -07:00
committed by android-build-merger
parent 04e48eae76 f81ec88024
commit d735f982d2
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/xml/my_device_info.xml
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"