commit 1fad9af3c7b16669fc5d31f442fbd85e380001e9
author Andrew Sapperstein <asapperstein@google.com> Tue May 31 10:34:01 2016 -0700
committer Andrew Sapperstein <asapperstein@google.com> Thu Jun 02 14:12:19 2016 -0700
tree 064acacb53030e29213dc4d0aef5e22c9ada8e46
parent c687e9bfbd698964bfbd75d5741a8ffb3b7e9a13

Add safety & regulatory info to "about device".

Renamed "Regulatory information" to "Regulatory labels"
and added a new option called "Safety & regulatory information".

The new option only shows if an activity exists that can
accept android.settings.SHOW_SAFETY_AND_REGULATORY_INFO intents.

BUG: 27876015
Change-Id: Iaf9588658eb7919b330ac8b3d673b8e81a4f76dc

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6d990b7..f72aa8e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2665,7 +2665,7 @@
 
         <!-- Show regulatory info (from settings item or dialing "*#07#") -->
         <activity android:name="RegulatoryInfoDisplayActivity"
-                  android:label="@string/regulatory_information"
+                  android:label="@string/regulatory_labels"
                   android:taskAffinity=""
                   android:enabled="@bool/config_show_regulatory_info">
             <intent-filter>