diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 01:48:46 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 05:36:41 +0000 |
| commit | 3958d23a64c56880373e7d0b74fe31769d911f97 (patch) | |
| tree | 2f6fbc8cdb72a2da8476950d2836436539ef7c7d /AndroidManifest.xml | |
| parent | 834aaac252177132141876bdcc86f014f4f946be (diff) | |
| parent | 5300af9c545cfd9a04de7e76977495ca4028268b (diff) | |
| download | packages_apps_Contacts-3958d23a64c56880373e7d0b74fe31769d911f97.tar.gz packages_apps_Contacts-3958d23a64c56880373e7d0b74fe31769d911f97.tar.bz2 packages_apps_Contacts-3958d23a64c56880373e7d0b74fe31769d911f97.zip | |
Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
Change-Id: Id46049636cf22ab5a34807210737b2af1d724ec8
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1f13c0465..11a259af2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -496,14 +496,6 @@ android:exported="false" /> <!-- end vCard related --> - <!-- Pinned header list demo --> - <activity android:name=".widget.PinnedHeaderListDemoActivity"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> - </activity> - <!-- Intercept Dialer Intents for devices without a phone. This activity should have the same intent filters as the DialtactsActivity, so that its capturing the same events. Omit android.intent.category.LAUNCHER, because @@ -533,6 +525,14 @@ </intent-filter> </activity> + <activity android:name="com.android.contacts.common.dialog.CallSubjectDialog" + android:theme="@style/Theme.CallSubjectDialogTheme" + android:windowSoftInputMode="stateVisible|adjustResize"> + <intent-filter> + <action android:name="android.intent.action.VIEW"/> + </intent-filter> + </activity> + <!-- Service that is exclusively for the Phone application that sends out a view notification. This service might be removed in future versions of the app. |