diff options
| author | Brian Attwell <brianattwell@google.com> | 2015-05-12 20:00:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-12 20:00:55 +0000 |
| commit | 625367605612e4fd84dbeb56e273bea409b8473d (patch) | |
| tree | 5550a36344832a73c1c9f286b784e43937602f53 | |
| parent | 6cab2abd622e576abab98cc3166e81dcca2e11d9 (diff) | |
| parent | 6923a587e5cf67f5d08c232689a6b2616d2282f6 (diff) | |
am 6923a587: am 2dca7e69: am 4244689e: Merge "add RequestImportVCardPermissionsActivity to manifest" into mnc-dev
* commit '6923a587e5cf67f5d08c232689a6b2616d2282f6':
add RequestImportVCardPermissionsActivity to manifest
| -rw-r--r-- | AndroidManifest.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8ca8e4c97..fc5fed635 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -197,6 +197,12 @@ android:label="@string/custom_list_filter" android:theme="@style/ContactListFilterTheme"/> + <activity + android:name="com.android.contacts.common.activity.RequestImportVCardPermissionsActivity" + android:label="@string/launcherActivityLabel" + android:theme="@style/BackgroundOnlyTheme" + android:exported="false"/> + <!-- vCard related --> <activity android:name="com.android.contacts.common.vcard.ImportVCardActivity" android:configChanges="orientation|screenSize|keyboardHidden" |