diff options
| author | Zach Kuznia <zork@google.com> | 2015-10-01 00:08:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-01 00:08:05 +0000 |
| commit | ae8aea76e5cbef1eefde401f8622d05275156cf7 (patch) | |
| tree | 3a732a352c2377d48347e23411b844599b05519b /AndroidManifest.xml | |
| parent | 1207a50100bbb3aaa55fc6394e13ad18fc019f8e (diff) | |
| parent | 5adcb3d353b066a056b86ae66946a06a251ff1fb (diff) | |
| download | packages_apps_Settings-ae8aea76e5cbef1eefde401f8622d05275156cf7.zip packages_apps_Settings-ae8aea76e5cbef1eefde401f8622d05275156cf7.tar.gz packages_apps_Settings-ae8aea76e5cbef1eefde401f8622d05275156cf7.tar.bz2 | |
Merge "Allow manual to be read from disk" into mnc-dr-dev
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 883a672..b003e39 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2419,6 +2419,19 @@ android:resource="@id/notification_settings" /> </activity> + <!-- Show Manual (from settings item) --> + <activity android:name="ManualDisplayActivity" + android:label="@string/manual" + android:taskAffinity="" + android:enabled="@bool/config_show_manual"> + <intent-filter> + <action android:name="android.settings.SHOW_MANUAL" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" + android:value="true" /> + </activity> + <!-- Show regulatory info (from settings item or dialing "*#07#") --> <activity android:name="RegulatoryInfoDisplayActivity" android:label="@string/regulatory_information" |