Merge "Move safety & regulatory manual closer to legal settings" into pi-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
f81ec88024
@@ -71,10 +71,18 @@
|
|||||||
<intent android:action="android.settings.SHOW_REGULATORY_INFO"/>
|
<intent android:action="android.settings.SHOW_REGULATORY_INFO"/>
|
||||||
</Preference>
|
</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 -->
|
<!-- SIM status -->
|
||||||
<Preference
|
<Preference
|
||||||
android:key="sim_status"
|
android:key="sim_status"
|
||||||
android:order="7"
|
android:order="8"
|
||||||
android:title="@string/sim_status_title"
|
android:title="@string/sim_status_title"
|
||||||
settings:keywords="@string/keywords_sim_status"
|
settings:keywords="@string/keywords_sim_status"
|
||||||
android:summary="@string/summary_placeholder"
|
android:summary="@string/summary_placeholder"
|
||||||
@@ -129,14 +137,6 @@
|
|||||||
android:summary="@string/summary_placeholder"
|
android:summary="@string/summary_placeholder"
|
||||||
android:selectable="false"/>
|
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 -->
|
<!-- Manual -->
|
||||||
<Preference
|
<Preference
|
||||||
android:key="manual"
|
android:key="manual"
|
||||||
|
Reference in New Issue
Block a user